@aeolus-fleet/core 0.38.2 → 0.38.4
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/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 +1 -0
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js +1 -0
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.d.ts +1 -0
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js +1 -0
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js.map +1 -1
- package/dist/adapters/prisma/generated/models/CrewRequest.d.ts +218 -1
- package/dist/adapters/prisma/generated/models/Ship.d.ts +417 -0
- package/dist/adapters/prisma/registry.d.ts +10 -1
- package/dist/adapters/prisma/registry.js +25 -5
- package/dist/adapters/prisma/registry.js.map +1 -1
- package/dist/adapters/prisma/rows.js +6 -1
- package/dist/adapters/prisma/rows.js.map +1 -1
- package/dist/adapters/trpc/fleet.d.ts +23 -11
- package/dist/adapters/trpc/fleet.js +1 -1
- package/dist/adapters/trpc/fleet.js.map +1 -1
- package/dist/adapters/trpc/router.d.ts +32 -11
- package/dist/adapters/trpc/ship.d.ts +9 -0
- package/dist/adapters/trpc/ship.js +7 -4
- package/dist/adapters/trpc/ship.js.map +1 -1
- package/dist/domain/messaging/push-receive-deliveries.d.ts +4 -3
- package/dist/domain/messaging/push-receive-deliveries.js.map +1 -1
- package/dist/domain/messaging/read-delivery.d.ts +4 -2
- package/dist/domain/messaging/read-delivery.js.map +1 -1
- package/dist/domain/messaging/read-exchange.d.ts +10 -1
- package/dist/domain/messaging/read-exchange.js +4 -1
- package/dist/domain/messaging/read-exchange.js.map +1 -1
- package/dist/domain/messaging/read-record.d.ts +5 -3
- package/dist/domain/messaging/read-record.js +7 -6
- package/dist/domain/messaging/read-record.js.map +1 -1
- package/dist/domain/messaging/receive-deliveries.d.ts +10 -7
- package/dist/domain/messaging/receive-deliveries.js +7 -6
- package/dist/domain/messaging/receive-deliveries.js.map +1 -1
- package/dist/domain/registry/crew-request.d.ts +4 -1
- package/dist/domain/registry/crew-request.js +2 -1
- package/dist/domain/registry/crew-request.js.map +1 -1
- package/dist/domain/registry/list-fleet.d.ts +6 -1
- package/dist/domain/registry/list-fleet.js +2 -1
- package/dist/domain/registry/list-fleet.js.map +1 -1
- package/dist/domain/registry/network-settings.d.ts +5 -3
- package/dist/domain/registry/network-settings.js +11 -3
- package/dist/domain/registry/network-settings.js.map +1 -1
- package/dist/domain/registry/ports.d.ts +7 -0
- package/dist/domain/registry/public.d.ts +1 -0
- package/dist/domain/registry/public.js +1 -0
- package/dist/domain/registry/public.js.map +1 -1
- package/dist/domain/registry/read-built-in-rules.js +2 -0
- package/dist/domain/registry/read-built-in-rules.js.map +1 -1
- package/dist/domain/registry/request-crew.d.ts +5 -4
- package/dist/domain/registry/request-crew.js +9 -4
- package/dist/domain/registry/request-crew.js.map +1 -1
- package/dist/domain/registry/senders.d.ts +42 -0
- package/dist/domain/registry/senders.js +28 -0
- package/dist/domain/registry/senders.js.map +1 -0
- package/dist/domain/registry/ships.d.ts +1 -2
- package/dist/domain/registry/ships.js +1 -2
- package/dist/domain/registry/ships.js.map +1 -1
- package/package.json +2 -2
- package/src/adapters/prisma/migrations/20261110090000_crew_request_requested_by/migration.sql +7 -0
- package/src/adapters/prisma/schema.prisma +6 -0
|
@@ -46,6 +46,11 @@ export interface ListedShip {
|
|
|
46
46
|
id: ShipId;
|
|
47
47
|
name: string;
|
|
48
48
|
} | null;
|
|
49
|
+
/** The ship that made it last, by id and name; null for a request made before it was recorded. */
|
|
50
|
+
requestedBy: {
|
|
51
|
+
id: ShipId;
|
|
52
|
+
name: string;
|
|
53
|
+
} | null;
|
|
49
54
|
/** The ship that got the starting prompt its crew claimed with: argo for a hand crew, or its trierarch; null while not crewed. */
|
|
50
55
|
crewedBy: {
|
|
51
56
|
id: ShipId;
|
|
@@ -106,4 +111,4 @@ export declare function createListFleet(deps: {
|
|
|
106
111
|
readReach: ReadReachOf;
|
|
107
112
|
}): ListFleet;
|
|
108
113
|
/** A ship as the fleet snapshot shows it, from what the listing read about it. */
|
|
109
|
-
export declare function listedShipOf({ ship, openLease, validSecret, crewRequest, crewRequestAssignee, crewRequestGivenBack, labels, crewedBy, lastPing, lastModel, lastViewedAt, lastLeaseEndedAt, openAlertCount, }: ShipFacts): ListedShip;
|
|
114
|
+
export declare function listedShipOf({ ship, openLease, validSecret, crewRequest, crewRequestAssignee, crewRequestRequester, crewRequestGivenBack, labels, crewedBy, lastPing, lastModel, lastViewedAt, lastLeaseEndedAt, openAlertCount, }: ShipFacts): ListedShip;
|
|
@@ -35,7 +35,7 @@ export function createListFleet(deps) {
|
|
|
35
35
|
};
|
|
36
36
|
}
|
|
37
37
|
/** A ship as the fleet snapshot shows it, from what the listing read about it. */
|
|
38
|
-
export function listedShipOf({ ship, openLease, validSecret, crewRequest, crewRequestAssignee, crewRequestGivenBack, labels, crewedBy, lastPing, lastModel, lastViewedAt, lastLeaseEndedAt, openAlertCount, }) {
|
|
38
|
+
export function listedShipOf({ ship, openLease, validSecret, crewRequest, crewRequestAssignee, crewRequestRequester, crewRequestGivenBack, labels, crewedBy, lastPing, lastModel, lastViewedAt, lastLeaseEndedAt, openAlertCount, }) {
|
|
39
39
|
const status = shipStatus(ship, { isCrewed: openLease !== null });
|
|
40
40
|
return {
|
|
41
41
|
id: ship.id,
|
|
@@ -55,6 +55,7 @@ export function listedShipOf({ ship, openLease, validSecret, crewRequest, crewRe
|
|
|
55
55
|
settingsVersion: crewRequest.settingsVersion,
|
|
56
56
|
requestedAt: crewRequest.requestedAt,
|
|
57
57
|
assignedTo: crewRequestAssignee,
|
|
58
|
+
requestedBy: crewRequestRequester,
|
|
58
59
|
status: crewRequest.status,
|
|
59
60
|
reason: crewRequest.reason,
|
|
60
61
|
crewedBy,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-fleet.js","sourceRoot":"","sources":["../../../src/domain/registry/list-fleet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAkF,MAAM,sBAAsB,CAAC;AAGzI,OAAO,EAAE,SAAS,EAAoB,MAAM,iBAAiB,CAAC;AAE9D,OAAO,EAAE,YAAY,EAAmB,MAAM,kBAAkB,CAAC;AAGjE,OAAO,EAAE,aAAa,EAAmB,MAAM,4BAA4B,CAAC;AAK5E,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"list-fleet.js","sourceRoot":"","sources":["../../../src/domain/registry/list-fleet.ts"],"names":[],"mappings":"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"}
|
|
@@ -63,8 +63,8 @@ export type SetBuiltInRuleRefusal = DomainError<'BUILT_IN_RULE_FIXED'>;
|
|
|
63
63
|
/**
|
|
64
64
|
* A built-in rule turned on or off, as its own action (decision 0034): the
|
|
65
65
|
* viewer reading, by any actor holding fleet:network (decision 0053). argo,
|
|
66
|
-
* the owner, the answer, a connected plugin's reading and
|
|
67
|
-
* managing are never off, and open follows the applied rules, so turning them
|
|
66
|
+
* the owner, the answer, a connected plugin's reading and sending, a send to a
|
|
67
|
+
* plugin and the installation's managing are never off, and open follows the applied rules, so turning them
|
|
68
68
|
* is refused. A change moves the version and writes BuiltInRuleChanged; a
|
|
69
69
|
* rule already as asked changes nothing.
|
|
70
70
|
*/
|
|
@@ -156,7 +156,9 @@ export type ReachingActor = ReachingShip | ReachingAccount | ReachingInstallatio
|
|
|
156
156
|
* only by a rule, so argo's messages are not every ship's to read; an owner's
|
|
157
157
|
* ship reaches the ships it owns (decision 0045), and an account the ships
|
|
158
158
|
* its person ship owns; a ship answers the sender of a message it received;
|
|
159
|
-
* a plugin ship reads every ship, by its kind (decision 0050)
|
|
159
|
+
* a plugin ship reads every ship, by its kind (decision 0050), every ship
|
|
160
|
+
* sends to a plugin ship and a plugin ship sends to every ship, so plugins
|
|
161
|
+
* are always reachable; and the installation manages
|
|
160
162
|
* person ships and the ships they own (decision 0020). The viewer reads
|
|
161
163
|
* every ship while that is on, and every actor reaches every ship by every
|
|
162
164
|
* verb while open is. Otherwise a rule of the verb must match the sender
|
|
@@ -66,8 +66,8 @@ export function withDeclaredRulesChanged(current) {
|
|
|
66
66
|
/**
|
|
67
67
|
* A built-in rule turned on or off, as its own action (decision 0034): the
|
|
68
68
|
* viewer reading, by any actor holding fleet:network (decision 0053). argo,
|
|
69
|
-
* the owner, the answer, a connected plugin's reading and
|
|
70
|
-
* managing are never off, and open follows the applied rules, so turning them
|
|
69
|
+
* the owner, the answer, a connected plugin's reading and sending, a send to a
|
|
70
|
+
* plugin and the installation's managing are never off, and open follows the applied rules, so turning them
|
|
71
71
|
* is refused. A change moves the version and writes BuiltInRuleChanged; a
|
|
72
72
|
* rule already as asked changes nothing.
|
|
73
73
|
*/
|
|
@@ -167,7 +167,9 @@ function owningShipOf(actor) {
|
|
|
167
167
|
* only by a rule, so argo's messages are not every ship's to read; an owner's
|
|
168
168
|
* ship reaches the ships it owns (decision 0045), and an account the ships
|
|
169
169
|
* its person ship owns; a ship answers the sender of a message it received;
|
|
170
|
-
* a plugin ship reads every ship, by its kind (decision 0050)
|
|
170
|
+
* a plugin ship reads every ship, by its kind (decision 0050), every ship
|
|
171
|
+
* sends to a plugin ship and a plugin ship sends to every ship, so plugins
|
|
172
|
+
* are always reachable; and the installation manages
|
|
171
173
|
* person ships and the ships they own (decision 0020). The viewer reads
|
|
172
174
|
* every ship while that is on, and every actor reaches every ship by every
|
|
173
175
|
* verb while open is. Otherwise a rule of the verb must match the sender
|
|
@@ -191,6 +193,12 @@ export function reachRuleOf(inForce, send) {
|
|
|
191
193
|
if (verb === 'read' && sender.kind === 'plugin') {
|
|
192
194
|
return { builtIn: 'pluginRead' };
|
|
193
195
|
}
|
|
196
|
+
if (verb === 'send' && recipient.kind === 'plugin') {
|
|
197
|
+
return { builtIn: 'sendToPlugin' };
|
|
198
|
+
}
|
|
199
|
+
if (verb === 'send' && sender.kind === 'plugin') {
|
|
200
|
+
return { builtIn: 'pluginSend' };
|
|
201
|
+
}
|
|
194
202
|
if (verb === 'read' && sender.kind === 'viewer' && inForce.isViewerReadOn) {
|
|
195
203
|
return { builtIn: 'viewerRead' };
|
|
196
204
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network-settings.js","sourceRoot":"","sources":["../../../src/domain/registry/network-settings.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"network-settings.js","sourceRoot":"","sources":["../../../src/domain/registry/network-settings.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,gBAAgB,EAChB,eAAe,EACf,WAAW,GAUZ,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAE/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAqBtD,uFAAuF;AACvF,MAAM,UAAU,iBAAiB,CAAC,OAAgB;IAChD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;AACpE,CAAC;AAID;;;;;;;;GAQG;AACH,MAAM,UAAU,YAAY,CAAC,KAAoC;IAC/D,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACnB,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,KAAK,CAAC,MAAM,GAAG,iBAAiB,EAAE,CAAC;QACrC,OAAO,yBAAyB,MAAM,CAAC,iBAAiB,CAAC,+EAA+E,CAAC;IAC3I,CAAC;IACD,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC;IAC9E,OAAO,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,kBAAkB,CAAC;AAC1E,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAC/B,OAAwB,EACxB,MAAyF;IAEzF,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;IACzB,IAAI,MAAM,CAAC,OAAO,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC;QACvC,OAAO,MAAM,CACX,0BAA0B,EAC1B,uCAAuC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,8CAA8C,CAChJ,CAAC;IACJ,CAAC;IACD,MAAM,QAAQ,GAAoB,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,GAAG,CAAC,EAAE,CAAC;IACrI,OAAO,EAAE,CAAC;QACR,QAAQ;QACR,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,iBAAiB;gBACvB,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,UAAU,EAAE,MAAM,CAAC,EAAE;gBACrB,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,OAAO,EAAE,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE;aACpF;SACF;KACF,CAAC,CAAC;AACL,CAAC;AAED,0GAA0G;AAC1G,MAAM,UAAU,wBAAwB,CAAC,OAAwB;IAC/D,OAAO,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,GAAG,CAAC,EAAE,CAAC;AACtD,CAAC;AAID;;;;;;;GAOG;AACH,MAAM,UAAU,cAAc,CAC5B,OAAwB,EACxB,MAA8D;IAE9D,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;IACzB,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC1B,OAAO,MAAM,CAAC,qBAAqB,EAAE,2FAA2F,CAAC,CAAC;IACpI,CAAC;IACD,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;QAChC,OAAO,MAAM,CAAC,qBAAqB,EAAE,qBAAqB,KAAK,CAAC,IAAI,+BAA+B,CAAC,CAAC;IACvG,CAAC;IACD,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC,cAAc,EAAE,CAAC;QAC1C,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;IAC/C,CAAC;IACD,MAAM,QAAQ,GAAoB,EAAE,GAAG,OAAO,EAAE,cAAc,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,GAAG,CAAC,EAAE,CAAC;IAC3G,OAAO,EAAE,CAAC;QACR,QAAQ;QACR,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,oBAAoB;gBAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,UAAU,EAAE,MAAM,CAAC,EAAE;gBACrB,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,OAAO,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE;aAC3E;SACF;KACF,CAAC,CAAC;AACL,CAAC;AAED,6GAA6G;AAC7G,MAAM,UAAU,WAAW,CAAC,IAAiB;IAC3C,OAAO,aAAa,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;AAC1C,CAAC;AAaD,MAAM,WAAW,GAA2B;IAC1C,IAAI,EAAE,QAAQ;IACd,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,KAAK,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IACxI,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,KAAK,gBAAgB;CAC5E,CAAC;AAEF,yHAAyH;AACzH,MAAM,UAAU,aAAa,CAAO,IAAoD,EAAE,IAAoB;IAC5G,OAAO,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAC9G,CAAC;AAED,SAAS,eAAe,CAAO,QAAyB,EAAE,IAAoB;IAC5E,IAAI,QAAQ,CAAC,MAAM,GAAG,eAAe,EAAE,CAAC;QACtC,OAAO,4BAA4B,MAAM,CAAC,eAAe,CAAC,gDAAgD,CAAC;IAC7G,CAAC;IACD,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACtD,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,CAAC;IACzE,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,oCAAoC,KAAK,QAAQ,CAAC;AAC7F,CAAC;AAED,SAAS,kBAAkB,CAAO,IAAoD,EAAE,IAAoB;IAC1G,MAAM,eAAe,GAAG,CAAC,QAAyB,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IACnH,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1E,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAClH,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO,2DAA2D,KAAK,IAAI,gBAAgB,sBAAsB,CAAC;IACpH,CAAC;IACD,MAAM,YAAY,GAAG,CAAC,QAAyB,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;IACpG,OAAO,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;QACtD,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,iEAAiE,gBAAgB,sBAAsB,CAAC;AAC9G,CAAC;AAED,+IAA+I;AAC/I,MAAM,UAAU,QAAQ,CAAC,IAAkB;IACzC,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;AACrF,CAAC;AAED,6EAA6E;AAC7E,MAAM,UAAU,UAAU,CAAC,IAAiB;IAC1C,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;AAC3F,CAAC;AAED,SAAS,UAAU,CAAC,IAAkB;IACpC,OAAO,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC;AACvD,CAAC;AAeD,oGAAoG;AACpG,MAAM,UAAU,YAAY,CAAC,GAAsE,EAAE,QAAyC;IAC5I,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,KAAK,KAAK,IAAI,EAAE,cAAc,EAAE,GAAG,CAAC,cAAc,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,IAAI,EAAE,EAAE,QAAQ,EAAE,CAAC;AAC9G,CAAC;AAgDD,SAAS,UAAU,CAAC,KAAoB;IACtC,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC7B,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC;IAC7D,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC;AACpH,CAAC;AAED,0GAA0G;AAC1G,SAAS,YAAY,CAAC,KAAoB;IACxC,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAC,YAAY,CAAC;IAC5B,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;AACzD,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,WAAW,CACzB,OAAqB,EACrB,IAAsG;IAEtG,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC;IAC3D,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,SAAS,CAAC,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,MAAM,CAAC,EAAE,CAAC;QACrF,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAC7B,CAAC;IACD,MAAM,UAAU,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACxC,IAAI,UAAU,KAAK,IAAI,IAAI,SAAS,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;QAC1D,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;IAC9B,CAAC;IACD,IAAI,IAAI,KAAK,MAAM,IAAI,gBAAgB,EAAE,CAAC;QACxC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;IAC/B,CAAC;IACD,IAAI,IAAI,KAAK,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAChD,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC;IACnC,CAAC;IACD,IAAI,IAAI,KAAK,MAAM,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACnD,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC;IACrC,CAAC;IACD,IAAI,IAAI,KAAK,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAChD,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC;IACnC,CAAC;IACD,IAAI,IAAI,KAAK,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;QAC1E,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC;IACnC,CAAC;IACD,IAAI,IAAI,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,KAAK,cAAc,IAAI,CAAC,SAAS,CAAC,IAAI,KAAK,QAAQ,IAAI,SAAS,CAAC,eAAe,CAAC,EAAE,CAAC;QACtH,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC;IACrC,CAAC;IACD,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAC7B,CAAC;IACD,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;IAC/D,MAAM,MAAM,GAAG,CAAC,IAAiB,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACnK,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC9C,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;QACjB,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IACzB,CAAC;IACD,KAAK,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACnD,MAAM,aAAa,GAAG,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC9C,IAAI,aAAa,KAAK,CAAC,CAAC,EAAE,CAAC;YACzB,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC;QACtD,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAKD,gHAAgH;AAChH,MAAM,UAAU,WAAW,CAAC,OAAqB,EAAE,IAAsG;IACvJ,OAAO,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,SAAS,CAAC;AAClD,CAAC;AAED,kFAAkF;AAClF,SAAS,OAAO,CAAC,QAAiC,EAAE,KAA+C;IACjG,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;AACtD,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,KAAK,CAAC,IAAkB,EAAE,KAA+C;IAChF,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IACzC,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC;IAC7D,CAAC;IACD,IAAI,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;QACtB,QAAQ,IAAI,CAAC,KAAK,EAAE,CAAC;YACnB,KAAK,eAAe;gBAClB,OAAO,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC;YAC7B,KAAK,gBAAgB;gBACnB,OAAO,IAAI,CAAC,KAAK,KAAK,IAAI,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,KAAK,CAAC;YAC/D;gBACE,OAAO,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC;QACrC,CAAC;IACH,CAAC;IACD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO,CAAC,CAAC;IAC7E,QAAQ,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,KAAK,eAAe;YAClB,OAAO,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;QAC3B,KAAK,gBAAgB;YACnB,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,KAAK,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IACvI,CAAC;AACH,CAAC"}
|
|
@@ -221,6 +221,8 @@ export interface LeaseRepository {
|
|
|
221
221
|
findOpenByIdForShare(fleetId: FleetId, leaseId: LeaseId): Promise<Lease | undefined>;
|
|
222
222
|
/** The ship's open lease, held as {@link findOpenByIdForShare} holds it. */
|
|
223
223
|
findOpenForShare(fleetId: FleetId, shipId: ShipId): Promise<Lease | undefined>;
|
|
224
|
+
/** Which of these ships hold an open lease now: read without a lock, for a status that is a fact of the moment. */
|
|
225
|
+
findCrewed(fleetId: FleetId, shipIds: readonly ShipId[]): Promise<ShipId[]>;
|
|
224
226
|
open(lease: Lease): Promise<void>;
|
|
225
227
|
/**
|
|
226
228
|
* Marks the lease last seen `at`, as a call by its crew does, keeping a
|
|
@@ -534,6 +536,11 @@ export interface ShipFacts {
|
|
|
534
536
|
id: ShipId;
|
|
535
537
|
name: string;
|
|
536
538
|
} | null;
|
|
539
|
+
/** The ship that made its crew request last, by id and name; null without a request, or for one made before it was recorded. */
|
|
540
|
+
crewRequestRequester: {
|
|
541
|
+
id: ShipId;
|
|
542
|
+
name: string;
|
|
543
|
+
} | null;
|
|
537
544
|
/** The ship's owner by id and name; null for argo and the viewer (decision 0045). */
|
|
538
545
|
owner: {
|
|
539
546
|
id: ShipId;
|
|
@@ -8,6 +8,7 @@ export { resolveInvitees, type Invitee, type ResolveInviteesTx } from './resolve
|
|
|
8
8
|
export { resolveLabelSelection, type ResolveLabelSelectionTx } from './resolve-label-selection.js';
|
|
9
9
|
export { labelValueTexts, type LabelValueTextsTx } from './label-value-texts.js';
|
|
10
10
|
export { findOperatorShip, findShip, findViewerShip, type FindShipTx, type ShipTx } from './ships.js';
|
|
11
|
+
export { findSender, findSenders, type FindSenderTx, type FindSendersTx, type Sender } from './senders.js';
|
|
11
12
|
export { isConsoleShip, OPERATOR_SHIP_NAME, shipStatus, type Ship } from './ship.js';
|
|
12
13
|
export { appliedLimits, type AppliedLimitsTx } from './applied-limits.js';
|
|
13
14
|
export { readsEvent, readsMessage, readsShip, type MessageParties, type ReadReach, type ReadReachOf } from './read-reach.js';
|
|
@@ -9,6 +9,7 @@ export { resolveInvitees } from './resolve-invitees.js';
|
|
|
9
9
|
export { resolveLabelSelection } from './resolve-label-selection.js';
|
|
10
10
|
export { labelValueTexts } from './label-value-texts.js';
|
|
11
11
|
export { findOperatorShip, findShip, findViewerShip } from './ships.js';
|
|
12
|
+
export { findSender, findSenders } from './senders.js';
|
|
12
13
|
export { isConsoleShip, OPERATOR_SHIP_NAME, shipStatus } from './ship.js';
|
|
13
14
|
export { appliedLimits } from './applied-limits.js';
|
|
14
15
|
export { readsEvent, readsMessage, readsShip } from './read-reach.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,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;AAC7H,OAAO,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,kBAAkB,EAA8C,MAAM,mBAAmB,CAAC;AAI/I,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,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,UAAU,EAAE,WAAW,EAAsD,MAAM,cAAc,CAAC;AAC3G,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;AAC7H,OAAO,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,kBAAkB,EAA8C,MAAM,mBAAmB,CAAC;AAI/I,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC"}
|
|
@@ -17,6 +17,8 @@ export function createReadBuiltInRules(deps) {
|
|
|
17
17
|
{ rule: 'owner', isOn: true },
|
|
18
18
|
{ rule: 'answer', isOn: true },
|
|
19
19
|
{ rule: 'pluginRead', isOn: true },
|
|
20
|
+
{ rule: 'sendToPlugin', isOn: true },
|
|
21
|
+
{ rule: 'pluginSend', isOn: true },
|
|
20
22
|
{ rule: 'meeting', isOn: true },
|
|
21
23
|
{ rule: 'viewerRead', isOn: isViewerReadOn },
|
|
22
24
|
{ rule: 'installation', isOn: true },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-built-in-rules.js","sourceRoot":"","sources":["../../../src/domain/registry/read-built-in-rules.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAUtD;;;;;;;;;GASG;AACH,MAAM,UAAU,sBAAsB,CAAC,IAA6C;IAClF,OAAO,CAAC,MAAM,EAAE,EAAE,CAChB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAA8C,EAAE;QACpE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,MAAM,EAAE,CAAC,eAAe,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACxF,OAAO,EAAE,CAAC;YACR,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE;YAC5B,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE;YAC7B,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE;YAC9B,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE;YAClC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE;YAC/B,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,cAAc,EAAE;YAC5C,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,IAAI,EAAE;YACpC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,KAAK,IAAI,EAAE;SACvC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
1
|
+
{"version":3,"file":"read-built-in-rules.js","sourceRoot":"","sources":["../../../src/domain/registry/read-built-in-rules.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAUtD;;;;;;;;;GASG;AACH,MAAM,UAAU,sBAAsB,CAAC,IAA6C;IAClF,OAAO,CAAC,MAAM,EAAE,EAAE,CAChB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAA8C,EAAE;QACpE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,MAAM,EAAE,CAAC,eAAe,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACxF,OAAO,EAAE,CAAC;YACR,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE;YAC5B,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE;YAC7B,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE;YAC9B,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE;YAClC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,IAAI,EAAE;YACpC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE;YAClC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE;YAC/B,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,cAAc,EAAE;YAC5C,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,IAAI,EAAE;YACpC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,KAAK,IAAI,EAAE;SACvC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -10,7 +10,7 @@ import { type CheckManageTx, type NotReachable } from './check-reach.js';
|
|
|
10
10
|
import type { CrewRequestRepository, LabelRepository, ShipRepository } from './ports.js';
|
|
11
11
|
import type { JsonObject } from './report-details.js';
|
|
12
12
|
export interface RequestCrewTx extends Omit<CheckManageTx, 'ships' | 'labels'> {
|
|
13
|
-
ships: Pick<ShipRepository, 'find' | 'findForUpdate'>;
|
|
13
|
+
ships: Pick<ShipRepository, 'find' | 'findForUpdate' | 'findOperatorShip'>;
|
|
14
14
|
crewRequests: CrewRequestRepository;
|
|
15
15
|
labels: Pick<LabelRepository, 'findByValueForShare' | 'carriedBy' | 'find' | 'findByKey'>;
|
|
16
16
|
events: EventLog;
|
|
@@ -20,15 +20,16 @@ export type RequestCrew = (caller: Caller, input: {
|
|
|
20
20
|
settings: JsonObject;
|
|
21
21
|
}) => Promise<Result<{
|
|
22
22
|
settingsVersion: number;
|
|
23
|
-
}, DomainError<'SHIP_NOT_FOUND'> | NotReachable | RequestCrewRefusal>>;
|
|
23
|
+
}, DomainError<'SHIP_NOT_FOUND' | 'FLEET_NOT_FOUND'> | NotReachable | RequestCrewRefusal>>;
|
|
24
24
|
/**
|
|
25
25
|
* Use case: a requester asks that a ship be kept crewed, with these settings,
|
|
26
26
|
* replacing any request the ship holds. Its scope (fleet:manage) is checked
|
|
27
27
|
* before this runs. In one unit of work, locking the ship first, as a retire
|
|
28
28
|
* does, so a retire and a request never cross; then holding the label of
|
|
29
29
|
* each machine label, as an assignment does, so a change of its values waits
|
|
30
|
-
* and the request never names a value it removed: the request
|
|
31
|
-
*
|
|
30
|
+
* and the request never names a value it removed: the request, its
|
|
31
|
+
* requester the caller's ship (an account and the installation request as
|
|
32
|
+
* argo, the ship that holds what they request), and CrewRequested.
|
|
32
33
|
*/
|
|
33
34
|
export declare function createRequestCrew(deps: {
|
|
34
35
|
uow: UnitOfWork<RequestCrewTx>;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { actorOf } from '../shared/caller.js';
|
|
1
|
+
import { actorOf, isShipCaller } from '../shared/caller.js';
|
|
2
2
|
import { refuse } from '../shared/errors.js';
|
|
3
3
|
import { recordEvent } from '../shared/events.js';
|
|
4
4
|
import { ok } from '../shared/result.js';
|
|
@@ -10,8 +10,9 @@ import { checkManage, keepingReachRefusal } from './check-reach.js';
|
|
|
10
10
|
* before this runs. In one unit of work, locking the ship first, as a retire
|
|
11
11
|
* does, so a retire and a request never cross; then holding the label of
|
|
12
12
|
* each machine label, as an assignment does, so a change of its values waits
|
|
13
|
-
* and the request never names a value it removed: the request
|
|
14
|
-
*
|
|
13
|
+
* and the request never names a value it removed: the request, its
|
|
14
|
+
* requester the caller's ship (an account and the installation request as
|
|
15
|
+
* argo, the ship that holds what they request), and CrewRequested.
|
|
15
16
|
*/
|
|
16
17
|
export function createRequestCrew(deps) {
|
|
17
18
|
return (caller, input) => keepingReachRefusal(deps.uow, async (tx) => {
|
|
@@ -32,7 +33,11 @@ export function createRequestCrew(deps) {
|
|
|
32
33
|
labelValues.add(valueId);
|
|
33
34
|
}
|
|
34
35
|
}
|
|
35
|
-
const
|
|
36
|
+
const requestedBy = isShipCaller(caller) ? caller.shipId : (await tx.ships.findOperatorShip(caller.fleetId))?.id;
|
|
37
|
+
if (requestedBy === undefined) {
|
|
38
|
+
return refuse('FLEET_NOT_FOUND', `Fleet ${caller.fleetId} does not exist`);
|
|
39
|
+
}
|
|
40
|
+
const requested = requestCrew({ ship, current, labelValues }, { settings: input.settings, requestedBy, at: deps.clock.now(), actor: actorOf(caller) });
|
|
36
41
|
if (!requested.isOk) {
|
|
37
42
|
return requested;
|
|
38
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-crew.js","sourceRoot":"","sources":["../../../src/domain/registry/request-crew.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAe,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"request-crew.js","sourceRoot":"","sources":["../../../src/domain/registry/request-crew.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import type { FleetId, ShipId, ShipStatus } from '@aeolus-fleet/common';
|
|
2
|
+
import { type DomainError } from '../shared/errors.js';
|
|
3
|
+
import { type Result } from '../shared/result.js';
|
|
4
|
+
import type { LeaseRepository, ShipRepository } from './ports.js';
|
|
5
|
+
import { type Ship } from './ship.js';
|
|
6
|
+
/**
|
|
7
|
+
* A message's sender as Registry holds it now, retired or not: Messaging's
|
|
8
|
+
* question when it hands a crew a delivery, so the crew can answer the sender
|
|
9
|
+
* by name and tell from its status whether it still could.
|
|
10
|
+
*/
|
|
11
|
+
export interface Sender {
|
|
12
|
+
ship: Ship;
|
|
13
|
+
status: ShipStatus;
|
|
14
|
+
}
|
|
15
|
+
/** The ports reading a sender takes, inside the caller's unit of work. */
|
|
16
|
+
export interface FindSenderTx {
|
|
17
|
+
ships: Pick<ShipRepository, 'find'>;
|
|
18
|
+
leases: Pick<LeaseRepository, 'findCrewed'>;
|
|
19
|
+
}
|
|
20
|
+
/** The ports reading a page's senders takes, inside the caller's unit of work. */
|
|
21
|
+
export interface FindSendersTx {
|
|
22
|
+
ships: Pick<ShipRepository, 'findMany'>;
|
|
23
|
+
leases: Pick<LeaseRepository, 'findCrewed'>;
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* One sender, by its id: its current name and type, and its status derived as
|
|
27
|
+
* the fleet read derives it. Read without a lock: a retire or a release that
|
|
28
|
+
* commits meanwhile shows at the next read.
|
|
29
|
+
*/
|
|
30
|
+
export declare function findSender(tx: FindSenderTx, input: {
|
|
31
|
+
fleetId: FleetId;
|
|
32
|
+
shipId: ShipId;
|
|
33
|
+
}): Promise<Result<Sender, DomainError<'SHIP_NOT_FOUND'>>>;
|
|
34
|
+
/**
|
|
35
|
+
* The senders of a page of deliveries, by id, in two batched reads however
|
|
36
|
+
* many deliveries each one sent: the ships, then which of them a session
|
|
37
|
+
* crews. Read without a lock, as {@link findSender} reads one.
|
|
38
|
+
*/
|
|
39
|
+
export declare function findSenders(tx: FindSendersTx, input: {
|
|
40
|
+
fleetId: FleetId;
|
|
41
|
+
shipIds: readonly ShipId[];
|
|
42
|
+
}): Promise<Map<ShipId, Sender>>;
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { refuse } from '../shared/errors.js';
|
|
2
|
+
import { ok } from '../shared/result.js';
|
|
3
|
+
import { shipStatus } from './ship.js';
|
|
4
|
+
/**
|
|
5
|
+
* One sender, by its id: its current name and type, and its status derived as
|
|
6
|
+
* the fleet read derives it. Read without a lock: a retire or a release that
|
|
7
|
+
* commits meanwhile shows at the next read.
|
|
8
|
+
*/
|
|
9
|
+
export async function findSender(tx, input) {
|
|
10
|
+
const ship = await tx.ships.find(input.fleetId, input.shipId);
|
|
11
|
+
if (!ship) {
|
|
12
|
+
return refuse('SHIP_NOT_FOUND', `Ship ${input.shipId} does not exist`);
|
|
13
|
+
}
|
|
14
|
+
const crewed = await tx.leases.findCrewed(input.fleetId, [ship.id]);
|
|
15
|
+
return ok({ ship, status: shipStatus(ship, { isCrewed: crewed.includes(ship.id) }) });
|
|
16
|
+
}
|
|
17
|
+
/**
|
|
18
|
+
* The senders of a page of deliveries, by id, in two batched reads however
|
|
19
|
+
* many deliveries each one sent: the ships, then which of them a session
|
|
20
|
+
* crews. Read without a lock, as {@link findSender} reads one.
|
|
21
|
+
*/
|
|
22
|
+
export async function findSenders(tx, input) {
|
|
23
|
+
const shipIds = [...new Set(input.shipIds)];
|
|
24
|
+
const ships = await tx.ships.findMany(input.fleetId, shipIds);
|
|
25
|
+
const crewed = new Set(await tx.leases.findCrewed(input.fleetId, ships.map((ship) => ship.id)));
|
|
26
|
+
return new Map(ships.map((ship) => [ship.id, { ship, status: shipStatus(ship, { isCrewed: crewed.has(ship.id) }) }]));
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=senders.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"senders.js","sourceRoot":"","sources":["../../../src/domain/registry/senders.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,UAAU,EAAa,MAAM,WAAW,CAAC;AAwBlD;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,EAAgB,EAChB,KAA2C;IAE3C,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC9D,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,MAAM,CAAC,gBAAgB,EAAE,QAAQ,KAAK,CAAC,MAAM,iBAAiB,CAAC,CAAC;IACzE,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IACpE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;AACxF,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,EAAiB,EAAE,KAAuD;IAC1G,MAAM,OAAO,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IAC5C,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC9D,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAChG,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACxH,CAAC"}
|
|
@@ -16,8 +16,7 @@ export interface FindShipTx {
|
|
|
16
16
|
}
|
|
17
17
|
/**
|
|
18
18
|
* A ship of the fleet as it is now, retired or not: its current name and
|
|
19
|
-
* type.
|
|
20
|
-
* answer the sender by name. Read without a lock.
|
|
19
|
+
* type. Read without a lock.
|
|
21
20
|
*/
|
|
22
21
|
export declare function findShip(tx: FindShipTx, input: {
|
|
23
22
|
fleetId: FleetId;
|
|
@@ -12,8 +12,7 @@ export async function findViewerShip(tx, fleetId) {
|
|
|
12
12
|
}
|
|
13
13
|
/**
|
|
14
14
|
* A ship of the fleet as it is now, retired or not: its current name and
|
|
15
|
-
* type.
|
|
16
|
-
* answer the sender by name. Read without a lock.
|
|
15
|
+
* type. Read without a lock.
|
|
17
16
|
*/
|
|
18
17
|
export async function findShip(tx, input) {
|
|
19
18
|
const ship = await tx.ships.find(input.fleetId, input.shipId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ships.js","sourceRoot":"","sources":["../../../src/domain/registry/ships.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAQtD,gFAAgF;AAChF,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,EAAU,EACV,OAAgB;IAEhB,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACtD,OAAO,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,iBAAiB,EAAE,SAAS,OAAO,iBAAiB,CAAC,CAAC;AACxF,CAAC;AAED,gFAAgF;AAChF,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,EAAU,EAAE,OAAgB;IAC/D,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IACpD,OAAO,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,qBAAqB,EAAE,SAAS,OAAO,oEAAoE,CAAC,CAAC;AAC/I,CAAC;AAOD
|
|
1
|
+
{"version":3,"file":"ships.js","sourceRoot":"","sources":["../../../src/domain/registry/ships.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAQtD,gFAAgF;AAChF,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,EAAU,EACV,OAAgB;IAEhB,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACtD,OAAO,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,iBAAiB,EAAE,SAAS,OAAO,iBAAiB,CAAC,CAAC;AACxF,CAAC;AAED,gFAAgF;AAChF,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,EAAU,EAAE,OAAgB;IAC/D,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IACpD,OAAO,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,qBAAqB,EAAE,SAAS,OAAO,oEAAoE,CAAC,CAAC;AAC/I,CAAC;AAOD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,QAAQ,CAC5B,EAAc,EACd,KAA2C;IAE3C,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC9D,OAAO,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,gBAAgB,EAAE,QAAQ,KAAK,CAAC,MAAM,iBAAiB,CAAC,CAAC;AAC3F,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aeolus-fleet/core",
|
|
3
|
-
"version": "0.38.
|
|
3
|
+
"version": "0.38.4",
|
|
4
4
|
"description": "The Aeolus fleet server: ships, guaranteed delivery and the API for Claude Code, Codex and any agent.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"ai-agents",
|
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
"postpack": "rm LICENSE"
|
|
60
60
|
},
|
|
61
61
|
"dependencies": {
|
|
62
|
-
"@aeolus-fleet/common": "0.38.
|
|
62
|
+
"@aeolus-fleet/common": "0.38.4",
|
|
63
63
|
"@aws-sdk/client-kms": "^3.1159.0",
|
|
64
64
|
"@fastify/websocket": "^11.3.1",
|
|
65
65
|
"@modelcontextprotocol/server": "^2.3.0",
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
-- The ship that made a crew request last (docs/design enabled models, R2): where the trierarch plugin tells why it waits.
|
|
2
|
+
-- Null for a request made before it was recorded.
|
|
3
|
+
ALTER TABLE "crew_requests" ADD COLUMN "requested_by_ship_id" TEXT;
|
|
4
|
+
|
|
5
|
+
CREATE INDEX "crew_requests_fleet_id_requested_by_ship_id_idx" ON "crew_requests"("fleet_id", "requested_by_ship_id");
|
|
6
|
+
|
|
7
|
+
ALTER TABLE "crew_requests" ADD CONSTRAINT "crew_requests_fleet_id_requested_by_ship_id_fkey" FOREIGN KEY ("fleet_id", "requested_by_ship_id") REFERENCES "ships"("fleet_id", "id") ON DELETE RESTRICT ON UPDATE CASCADE;
|
|
@@ -173,6 +173,7 @@ model Ship {
|
|
|
173
173
|
events Event[] @relation("EventShip")
|
|
174
174
|
crewRequest CrewRequest? @relation("CrewRequestShip")
|
|
175
175
|
assignedCrews CrewRequest[] @relation("CrewRequestAssignee")
|
|
176
|
+
requestedCrews CrewRequest[] @relation("CrewRequestRequester")
|
|
176
177
|
givenBackCrews CrewRequestGiveBack[] @relation("CrewRequestGiveBackTrierarch")
|
|
177
178
|
clearRequests WorktreeClearRequest[] @relation("WorktreeClearRequestTrierarch")
|
|
178
179
|
clearedWorktrees WorktreeClearRequest[] @relation("WorktreeClearRequestShip")
|
|
@@ -345,6 +346,8 @@ model CrewRequest {
|
|
|
345
346
|
settings Json
|
|
346
347
|
settingsVersion Int @map("settings_version")
|
|
347
348
|
requestedAt DateTime @map("requested_at") @db.Timestamptz(3)
|
|
349
|
+
/// The ship that made it last; null for a request made before it was recorded.
|
|
350
|
+
requestedBy String? @map("requested_by_ship_id")
|
|
348
351
|
/// The trierarch ship it is assigned to; null while unassigned.
|
|
349
352
|
assignedTo String? @map("assigned_to_ship_id")
|
|
350
353
|
/// How its trierarch says the crew stands; null until it says.
|
|
@@ -361,11 +364,14 @@ model CrewRequest {
|
|
|
361
364
|
fleet Fleet @relation(fields: [fleetId], references: [id])
|
|
362
365
|
ship Ship @relation("CrewRequestShip", fields: [fleetId, shipId], references: [fleetId, id])
|
|
363
366
|
assignee Ship? @relation("CrewRequestAssignee", fields: [fleetId, assignedTo], references: [fleetId, id])
|
|
367
|
+
requester Ship? @relation("CrewRequestRequester", fields: [fleetId, requestedBy], references: [fleetId, id])
|
|
364
368
|
givenBack CrewRequestGiveBack[]
|
|
365
369
|
|
|
366
370
|
@@unique([fleetId, shipId])
|
|
367
371
|
/// A trierarch reads the requests assigned to it.
|
|
368
372
|
@@index([fleetId, assignedTo])
|
|
373
|
+
/// A delete of a ship checks the requests it made with an index.
|
|
374
|
+
@@index([fleetId, requestedBy])
|
|
369
375
|
@@map("crew_requests")
|
|
370
376
|
}
|
|
371
377
|
|