@aeolus-fleet/core 0.37.2 → 0.38.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/dist/adapters/http/server.js +12 -0
- package/dist/adapters/http/server.js.map +1 -1
- package/dist/adapters/prisma/client.d.ts +6 -0
- package/dist/adapters/prisma/client.js +16 -0
- package/dist/adapters/prisma/client.js.map +1 -1
- package/dist/adapters/prisma/harbour.d.ts +4 -2
- package/dist/adapters/prisma/harbour.js +12 -8
- package/dist/adapters/prisma/harbour.js.map +1 -1
- package/dist/adapters/prisma/registry.d.ts +3 -2
- package/dist/adapters/prisma/registry.js +32 -8
- package/dist/adapters/prisma/registry.js.map +1 -1
- package/dist/adapters/trpc/fleet.d.ts +19 -3
- package/dist/adapters/trpc/fleet.js +7 -4
- package/dist/adapters/trpc/fleet.js.map +1 -1
- package/dist/adapters/trpc/router.d.ts +17 -3
- package/dist/adapters/trpc/ship-protocol.js +1 -0
- package/dist/adapters/trpc/ship-protocol.js.map +1 -1
- package/dist/adapters/trpc/ship.js +1 -1
- package/dist/adapters/trpc/ship.js.map +1 -1
- package/dist/adapters/trpc/trpc.d.ts +3 -5
- package/dist/adapters/trpc/trpc.js +4 -4
- package/dist/adapters/trpc/trpc.js.map +1 -1
- package/dist/domain/messaging/delivery.d.ts +15 -7
- package/dist/domain/messaging/delivery.js +23 -19
- package/dist/domain/messaging/delivery.js.map +1 -1
- package/dist/domain/messaging/push-receive-deliveries.d.ts +3 -2
- package/dist/domain/messaging/push-receive-deliveries.js +14 -11
- package/dist/domain/messaging/push-receive-deliveries.js.map +1 -1
- package/dist/domain/registry/get-starting-prompt.d.ts +3 -3
- package/dist/domain/registry/get-starting-prompt.js +5 -5
- package/dist/domain/registry/get-starting-prompt.js.map +1 -1
- package/dist/domain/registry/harbour.d.ts +3 -13
- package/dist/domain/registry/harbour.js +1 -15
- package/dist/domain/registry/harbour.js.map +1 -1
- package/dist/domain/registry/list-ship-types.d.ts +7 -2
- package/dist/domain/registry/list-ship-types.js +1 -1
- package/dist/domain/registry/list-ship-types.js.map +1 -1
- package/dist/domain/registry/ports.d.ts +11 -3
- package/dist/domain/registry/read-harbour.d.ts +8 -3
- package/dist/domain/registry/read-harbour.js +6 -3
- package/dist/domain/registry/read-harbour.js.map +1 -1
- package/dist/domain/registry/read-reach.d.ts +2 -2
- package/dist/domain/registry/read-reach.js +14 -5
- package/dist/domain/registry/read-reach.js.map +1 -1
- package/package.json +2 -2
|
@@ -6,19 +6,22 @@ import { PAGE_SIZE_MAX } from '@aeolus-fleet/common';
|
|
|
6
6
|
* first and then by name, PAGE_SIZE_MAX a page unless the caller asks
|
|
7
7
|
* fewer, with where the next page starts; the numbers on the first page
|
|
8
8
|
* only, read with it. With ship ids, only those ships, for the live reload
|
|
9
|
-
* of their tiles: no numbers, no next page.
|
|
9
|
+
* of their tiles: no numbers, no next page. With the overview bar's filter,
|
|
10
|
+
* only the ships it selects; the numbers still count every ship Harbour
|
|
11
|
+
* shows (Thomas, #1605: the numbers are the fleet snapshot). The caller's scope (fleet:read)
|
|
10
12
|
* is checked before this runs.
|
|
11
13
|
*/
|
|
12
14
|
export function createReadHarbour(deps) {
|
|
13
15
|
return async (caller, input = {}) => {
|
|
14
16
|
const reach = await deps.readReach(caller);
|
|
17
|
+
const filter = input.filter ?? {};
|
|
15
18
|
if ('shipIds' in input) {
|
|
16
|
-
const { ships } = await deps.listing.harbour(caller.fleetId, { reach, shipIds: input.shipIds });
|
|
19
|
+
const { ships } = await deps.listing.harbour(caller.fleetId, { reach, filter, shipIds: input.shipIds });
|
|
17
20
|
return { ships: ships.map(({ ship }) => ship), nextCursor: null, counts: null };
|
|
18
21
|
}
|
|
19
22
|
const { cursor, limit = PAGE_SIZE_MAX } = input;
|
|
20
23
|
// One ship past the page tells whether another page follows.
|
|
21
|
-
const { ships, counts } = await deps.listing.harbour(caller.fleetId, { reach, after: cursor, limit: limit + 1 });
|
|
24
|
+
const { ships, counts } = await deps.listing.harbour(caller.fleetId, { reach, filter, after: cursor, limit: limit + 1 });
|
|
22
25
|
const page = ships.slice(0, limit);
|
|
23
26
|
const last = page.at(-1);
|
|
24
27
|
return { ships: page.map(({ ship }) => ship), nextCursor: ships.length > limit && last !== undefined ? last.position : null, counts };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-harbour.js","sourceRoot":"","sources":["../../../src/domain/registry/read-harbour.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAkC,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"read-harbour.js","sourceRoot":"","sources":["../../../src/domain/registry/read-harbour.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAkC,MAAM,sBAAsB,CAAC;AAcrF;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAAuD;IACvF,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,EAAE;QAClC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC;QAClC,IAAI,SAAS,IAAI,KAAK,EAAE,CAAC;YACvB,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YACxG,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QAClF,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,KAAK,GAAG,aAAa,EAAE,GAAG,KAAK,CAAC;QAChD,6DAA6D;QAC7D,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC;QACzH,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;QACnC,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACzB,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,MAAM,GAAG,KAAK,IAAI,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;IACxI,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -3,7 +3,7 @@ import type { Caller } from '../shared/caller.js';
|
|
|
3
3
|
import type { Recipient } from '../shared/selector.js';
|
|
4
4
|
import type { UnitOfWork } from '../shared/unit-of-work.js';
|
|
5
5
|
import { type CheckReachTx } from './check-reach.js';
|
|
6
|
-
import type { ShipRepository } from './ports.js';
|
|
6
|
+
import type { LabelRepository, ShipRepository } from './ports.js';
|
|
7
7
|
/**
|
|
8
8
|
* The ships a caller reads (decision 0034): every ship, or some by id, with
|
|
9
9
|
* the types of the active ones among them, by which an unclaimed message to a
|
|
@@ -20,7 +20,7 @@ export type ReadReach = {
|
|
|
20
20
|
export interface ReadReachTx {
|
|
21
21
|
networkSettings: CheckReachTx['networkSettings'];
|
|
22
22
|
ships: Pick<ShipRepository, 'find' | 'list'>;
|
|
23
|
-
labels: CheckReachTx['labels']
|
|
23
|
+
labels: CheckReachTx['labels'] & Pick<LabelRepository, 'carriedInFleet'>;
|
|
24
24
|
declaredNetworkRules: CheckReachTx['declaredNetworkRules'];
|
|
25
25
|
}
|
|
26
26
|
/** A message as read reach sees it: its sender, its recipient, and for a type the ship that claimed it, if one has. */
|
|
@@ -30,9 +30,11 @@ export function createReadReachOf(deps) {
|
|
|
30
30
|
}
|
|
31
31
|
const ships = await tx.ships.list(fleetId);
|
|
32
32
|
const kinds = new Map(ships.map((ship) => [ship.id, ship.kind]));
|
|
33
|
+
// The fleet's labels read once: a read per ship grew every read with every ship the fleet ever had (#1646).
|
|
34
|
+
const carried = labelsByShip(await tx.labels.carriedInFleet(fleetId));
|
|
33
35
|
const read = [];
|
|
34
36
|
for (const ship of ships) {
|
|
35
|
-
const recipient =
|
|
37
|
+
const recipient = reachingOf({ ship, ownerKind: ship.owner === null ? undefined : kinds.get(ship.owner), labels: carried.get(ship.id) ?? [] });
|
|
36
38
|
if (ship.id === readerShip?.id || (reader && allowsReach(inForce, { verb: 'read', sender: reader.reaching, recipient, isAnswerToSender: false }))) {
|
|
37
39
|
read.push(ship);
|
|
38
40
|
}
|
|
@@ -47,10 +49,17 @@ export function createReadReachOf(deps) {
|
|
|
47
49
|
return worked.isOk ? worked.value : { kind: 'some', shipIds: new Set(caller.kind === 'account' || caller.kind === 'installation' ? [] : [caller.shipId]), types: new Set() };
|
|
48
50
|
};
|
|
49
51
|
}
|
|
50
|
-
/**
|
|
51
|
-
|
|
52
|
-
const
|
|
53
|
-
const
|
|
52
|
+
/** The values each ship carries, by ship. */
|
|
53
|
+
function labelsByShip(carried) {
|
|
54
|
+
const byShip = new Map();
|
|
55
|
+
for (const { shipId, labelId, valueId } of carried) {
|
|
56
|
+
byShip.set(shipId, [...(byShip.get(shipId) ?? []), { labelId, valueId }]);
|
|
57
|
+
}
|
|
58
|
+
return byShip;
|
|
59
|
+
}
|
|
60
|
+
/** A ship as a read check sees it, its owner's kind and its labels taken from the fleet's reads rather than read again. */
|
|
61
|
+
function reachingOf(of) {
|
|
62
|
+
const { ship, ownerKind, labels } = of;
|
|
54
63
|
return { id: ship.id, owner: ship.owner, kind: ship.kind, isOwnedByPerson: ownerKind === 'person', labels };
|
|
55
64
|
}
|
|
56
65
|
export function readsShip(reach, shipId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-reach.js","sourceRoot":"","sources":["../../../src/domain/registry/read-reach.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAGtD,OAAO,EAAE,WAAW,EAAE,cAAc,EAAqB,MAAM,kBAAkB,CAAC;AAClF,OAAO,EAAE,WAAW,EAAqB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"read-reach.js","sourceRoot":"","sources":["../../../src/domain/registry/read-reach.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aeolus-fleet/core",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.38.0",
|
|
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.
|
|
62
|
+
"@aeolus-fleet/common": "0.38.0",
|
|
63
63
|
"@aws-sdk/client-kms": "^3.1159.0",
|
|
64
64
|
"@fastify/websocket": "^11.3.1",
|
|
65
65
|
"@modelcontextprotocol/server": "^2.3.0",
|