@aeolus-fleet/trierarch-plugin 0.19.0 → 0.20.1
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 -0
- package/dist/adapters/fleet/rest-fleet-door.js +22 -3
- package/dist/adapters/fleet/rest-fleet-door.js.map +1 -1
- package/dist/adapters/trpc/router.d.ts +63 -4
- package/dist/adapters/trpc/router.js +23 -1
- package/dist/adapters/trpc/router.js.map +1 -1
- package/dist/app.d.ts +1 -1
- package/dist/app.js +28 -0
- package/dist/app.js.map +1 -1
- package/dist/core/assignment/assign-crews.d.ts +1 -1
- package/dist/core/assignment/assign-crews.js +5 -28
- package/dist/core/assignment/assign-crews.js.map +1 -1
- package/dist/core/assignment/check-crew-settings.d.ts +19 -0
- package/dist/core/assignment/check-crew-settings.js +24 -0
- package/dist/core/assignment/check-crew-settings.js.map +1 -0
- package/dist/core/assignment/placement.d.ts +24 -2
- package/dist/core/assignment/placement.js +55 -15
- package/dist/core/assignment/placement.js.map +1 -1
- package/dist/core/assignment/read-placement.d.ts +17 -0
- package/dist/core/assignment/read-placement.js +39 -0
- package/dist/core/assignment/read-placement.js.map +1 -0
- package/dist/core/connection/ports.d.ts +39 -1
- package/dist/core/machines/label-machines.d.ts +25 -0
- package/dist/core/machines/label-machines.js +120 -0
- package/dist/core/machines/label-machines.js.map +1 -0
- package/package.json +3 -3
package/README.md
CHANGED
|
@@ -33,6 +33,7 @@ One tRPC router at `/trpc`, called with the console's session cookie, which the
|
|
|
33
33
|
| `connection.connect` | Connects with its ship's id and secret (`fleet:manage` session). Refused while connected (CONFLICT), for a ship of another fleet or without the three scopes (BAD_REQUEST) |
|
|
34
34
|
| `machines.join` | Brings a machine in, by name (`fleet:manage` session): commissions a ship of type `trierarch` with `crew:run` and answers its starting prompt, crew lines, secret and setup line, `npx @aeolus-fleet/trierarch init --fleet-url <url> --ship-id <id> --secret <secret>`, each shown once. A name an active ship holds: CONFLICT |
|
|
35
35
|
| `machines.list` | The fleet's active ships of type `trierarch`, each with its trierarch's last report and details (null until it reports), and whether it is silent |
|
|
36
|
+
| `requests.check` | Whether crew settings would be placed now, by assignment's rules, before a crew is requested with them: `fits`; `refused` with the settings field at fault and why; or `noRoom` when they fit but no trierarch has room (a request would wait). Writes nothing |
|
|
36
37
|
| `installation.setEnabled`, `get`, `delete` | With `x-aeolus-installation-token`: switches a fleet on or off, reads it, forgets it (decision 0021) |
|
|
37
38
|
|
|
38
39
|
While it is off for the fleet, every procedure but `connection.status` answers FORBIDDEN; until it is connected, `machines.*` answer PRECONDITION_FAILED.
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* like any client (decision 0030). A refusal reads as the fleet's code and
|
|
5
5
|
* message.
|
|
6
6
|
*/
|
|
7
|
-
import { commissionShipOutputSchema, fleetListOutputSchema, idSchema, shipDetailOutputSchema } from '@aeolus-fleet/common';
|
|
7
|
+
import { commissionShipOutputSchema, defineLabelOutputSchema, fleetListOutputSchema, idSchema, labelsOutputSchema, shipDetailOutputSchema } from '@aeolus-fleet/common';
|
|
8
8
|
import { z } from 'zod';
|
|
9
9
|
import { err, ok } from '../../core/shared/result.js';
|
|
10
10
|
const refusalSchema = z.object({ code: z.string(), message: z.string() });
|
|
@@ -78,15 +78,16 @@ export function createRestFleetDoor(fleetUrl) {
|
|
|
78
78
|
return ok({ shipId, prompt, crewLines, secret });
|
|
79
79
|
},
|
|
80
80
|
listShips: async (crewToken) => {
|
|
81
|
-
const listed = await call(fleetUrl, { path: '/fleet/list', method: '
|
|
81
|
+
const listed = await call(fleetUrl, { path: '/fleet/list', method: 'POST', crewToken, body: {}, answers: fleetListOutputSchema });
|
|
82
82
|
return listed.isOk
|
|
83
|
-
? ok(listed.value.map(({ id, name, type, status, lastSeenAt, crewRequest }) => ({
|
|
83
|
+
? ok(listed.value.map(({ id, name, type, status, lastSeenAt, crewRequest, labels }) => ({
|
|
84
84
|
shipId: id,
|
|
85
85
|
name,
|
|
86
86
|
type,
|
|
87
87
|
status,
|
|
88
88
|
lastSeenAt: dateOf(lastSeenAt),
|
|
89
89
|
crewRequest: crewRequest && { requestedAt: new Date(crewRequest.requestedAt), assignedTo: crewRequest.assignedTo?.id ?? null, reason: crewRequest.reason },
|
|
90
|
+
labels: labels.map(({ labelId, valueId }) => ({ labelId, valueId })),
|
|
90
91
|
})))
|
|
91
92
|
: listed;
|
|
92
93
|
},
|
|
@@ -94,6 +95,24 @@ export function createRestFleetDoor(fleetUrl) {
|
|
|
94
95
|
const claimed = await call(fleetUrl, { path: '/fleet/assignCrew', method: 'POST', crewToken, body: claim, answers: z.unknown() });
|
|
95
96
|
return claimed.isOk ? ok(undefined) : claimed;
|
|
96
97
|
},
|
|
98
|
+
listLabels: async (crewToken) => {
|
|
99
|
+
const listed = await call(fleetUrl, { path: '/fleet/labels', method: 'GET', crewToken, answers: labelsOutputSchema });
|
|
100
|
+
return listed.isOk
|
|
101
|
+
? ok(listed.value.map(({ id, key, values, owner }) => ({ labelId: id, key, values: values.map((value) => ({ valueId: value.id, value: value.value })), ownerShipId: owner.id })))
|
|
102
|
+
: listed;
|
|
103
|
+
},
|
|
104
|
+
defineLabel: async (crewToken, label) => {
|
|
105
|
+
const defined = await call(fleetUrl, { path: '/fleet/defineLabel', method: 'POST', crewToken, body: label, answers: defineLabelOutputSchema });
|
|
106
|
+
return defined.isOk ? ok({ labelId: defined.value.labelId, values: defined.value.values.map((value) => ({ valueId: value.id, value: value.value })) }) : defined;
|
|
107
|
+
},
|
|
108
|
+
assignLabel: async (crewToken, assignment) => {
|
|
109
|
+
const assigned = await call(fleetUrl, { path: '/fleet/assignLabel', method: 'POST', crewToken, body: assignment, answers: z.unknown() });
|
|
110
|
+
return assigned.isOk ? ok(undefined) : assigned;
|
|
111
|
+
},
|
|
112
|
+
unassignLabel: async (crewToken, assignment) => {
|
|
113
|
+
const unassigned = await call(fleetUrl, { path: '/fleet/unassignLabel', method: 'POST', crewToken, body: assignment, answers: z.unknown() });
|
|
114
|
+
return unassigned.isOk ? ok(undefined) : unassigned;
|
|
115
|
+
},
|
|
97
116
|
explainCrewRequest: async (crewToken, explanation) => {
|
|
98
117
|
const explained = await call(fleetUrl, { path: '/fleet/explainCrewRequest', method: 'POST', crewToken, body: explanation, answers: z.unknown() });
|
|
99
118
|
return explained.isOk ? ok(undefined) : explained;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rest-fleet-door.js","sourceRoot":"","sources":["../../../src/adapters/fleet/rest-fleet-door.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,0BAA0B,EAAE,qBAAqB,EAAE,QAAQ,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"rest-fleet-door.js","sourceRoot":"","sources":["../../../src/adapters/fleet/rest-fleet-door.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ import type { InstallationMode } from '../../core/installation/ports.js';
|
|
|
7
7
|
import type { ReadFleet } from '../../core/installation/read-fleet.js';
|
|
8
8
|
import type { IsServed } from '../../core/installation/served.js';
|
|
9
9
|
import type { SetFleetEnabled } from '../../core/installation/set-fleet-enabled.js';
|
|
10
|
+
import type { CheckCrewSettings } from '../../core/assignment/check-crew-settings.js';
|
|
10
11
|
import type { JoinMachine } from '../../core/machines/join-machine.js';
|
|
11
12
|
import type { ListMachines } from '../../core/machines/list-machines.js';
|
|
12
13
|
import type { AuthenticateOperator } from '../../core/operator/authenticate-operator.js';
|
|
@@ -32,9 +33,21 @@ export interface Context {
|
|
|
32
33
|
connect: Connect;
|
|
33
34
|
joinMachine: JoinMachine;
|
|
34
35
|
listMachines: ListMachines;
|
|
36
|
+
checkCrewSettings: CheckCrewSettings;
|
|
35
37
|
}
|
|
36
38
|
/** What a caller reads of a failure: nothing of it, so no crew token, secret or query ever leaves; the log holds it whole. */
|
|
37
39
|
export declare const INTERNAL_ERROR_MESSAGE = "Internal error";
|
|
40
|
+
/** What checking crew settings answers: a trierarch fits, none takes them (naming the settings field at fault), or none has room now. */
|
|
41
|
+
export declare const checkedSettingsOutputSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
|
|
42
|
+
kind: z.ZodLiteral<"fits">;
|
|
43
|
+
}, z.core.$strip>, z.ZodObject<{
|
|
44
|
+
kind: z.ZodLiteral<"refused">;
|
|
45
|
+
field: z.ZodString;
|
|
46
|
+
reason: z.ZodString;
|
|
47
|
+
}, z.core.$strip>, z.ZodObject<{
|
|
48
|
+
kind: z.ZodLiteral<"noRoom">;
|
|
49
|
+
reason: z.ZodString;
|
|
50
|
+
}, z.core.$strip>], "kind">;
|
|
38
51
|
/** A joined machine: its trierarch's ship, its starting prompt (decision 0019) and its setup line, each shown once. */
|
|
39
52
|
export declare const joinedMachineOutputSchema: z.ZodObject<{
|
|
40
53
|
shipId: z.ZodType<`shp_${string}`, unknown, z.core.$ZodTypeInternals<`shp_${string}`, unknown>>;
|
|
@@ -67,6 +80,7 @@ export declare const machineOutputSchema: z.ZodObject<{
|
|
|
67
80
|
harness: z.ZodString;
|
|
68
81
|
options: z.ZodRecord<z.ZodString, z.ZodJSONSchema>;
|
|
69
82
|
flags: z.ZodArray<z.ZodString>;
|
|
83
|
+
riskyFlags: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
70
84
|
}, z.core.$strict>>;
|
|
71
85
|
workspaces: z.ZodObject<{
|
|
72
86
|
repositories: z.ZodArray<z.ZodString>;
|
|
@@ -78,10 +92,22 @@ export declare const machineOutputSchema: z.ZodObject<{
|
|
|
78
92
|
}, z.core.$strict>;
|
|
79
93
|
kept: z.ZodArray<z.ZodObject<{
|
|
80
94
|
shipId: z.ZodType<`shp_${string}`, unknown, z.core.$ZodTypeInternals<`shp_${string}`, unknown>>;
|
|
81
|
-
|
|
95
|
+
repository: z.ZodString;
|
|
82
96
|
}, z.core.$strict>>;
|
|
83
97
|
orphans: z.ZodArray<z.ZodObject<{
|
|
84
|
-
|
|
98
|
+
repository: z.ZodString;
|
|
99
|
+
name: z.ZodString;
|
|
100
|
+
}, z.core.$strict>>;
|
|
101
|
+
machine: z.ZodOptional<z.ZodObject<{
|
|
102
|
+
os: z.ZodOptional<z.ZodEnum<{
|
|
103
|
+
macos: "macos";
|
|
104
|
+
linux: "linux";
|
|
105
|
+
windows: "windows";
|
|
106
|
+
}>>;
|
|
107
|
+
arch: z.ZodOptional<z.ZodEnum<{
|
|
108
|
+
arm64: "arm64";
|
|
109
|
+
amd64: "amd64";
|
|
110
|
+
}>>;
|
|
85
111
|
}, z.core.$strict>>;
|
|
86
112
|
version: z.ZodString;
|
|
87
113
|
}, z.core.$strict>>;
|
|
@@ -178,6 +204,7 @@ export declare const trierarchPluginRouter: import("@trpc/server").TRPCBuiltRout
|
|
|
178
204
|
harness: string;
|
|
179
205
|
options: Record<string, z.core.util.JSONType>;
|
|
180
206
|
flags: string[];
|
|
207
|
+
riskyFlags?: string[] | undefined;
|
|
181
208
|
}[];
|
|
182
209
|
workspaces: {
|
|
183
210
|
repositories: string[];
|
|
@@ -189,17 +216,49 @@ export declare const trierarchPluginRouter: import("@trpc/server").TRPCBuiltRout
|
|
|
189
216
|
};
|
|
190
217
|
kept: {
|
|
191
218
|
shipId: `shp_${string}`;
|
|
192
|
-
|
|
219
|
+
repository: string;
|
|
193
220
|
}[];
|
|
194
221
|
orphans: {
|
|
195
|
-
|
|
222
|
+
repository: string;
|
|
223
|
+
name: string;
|
|
196
224
|
}[];
|
|
197
225
|
version: string;
|
|
226
|
+
machine?: {
|
|
227
|
+
os?: "macos" | "linux" | "windows" | undefined;
|
|
228
|
+
arch?: "arm64" | "amd64" | undefined;
|
|
229
|
+
} | undefined;
|
|
198
230
|
} | null;
|
|
199
231
|
}[];
|
|
200
232
|
meta: object;
|
|
201
233
|
}>;
|
|
202
234
|
}>>;
|
|
235
|
+
requests: import("@trpc/server").TRPCBuiltRouter<{
|
|
236
|
+
ctx: Context;
|
|
237
|
+
meta: object;
|
|
238
|
+
errorShape: import("@trpc/server").TRPCDefaultErrorShape;
|
|
239
|
+
transformer: false;
|
|
240
|
+
}, import("@trpc/server").TRPCDecorateCreateRouterOptions<{
|
|
241
|
+
/**
|
|
242
|
+
* Whether crew settings would be placed now, by assignment's rules, before
|
|
243
|
+
* the console requests a crew with them (#245). It writes nothing.
|
|
244
|
+
*/
|
|
245
|
+
check: import("@trpc/server").TRPCQueryProcedure<{
|
|
246
|
+
input: {
|
|
247
|
+
settings: unknown;
|
|
248
|
+
};
|
|
249
|
+
output: {
|
|
250
|
+
kind: "fits";
|
|
251
|
+
} | {
|
|
252
|
+
kind: "refused";
|
|
253
|
+
field: string;
|
|
254
|
+
reason: string;
|
|
255
|
+
} | {
|
|
256
|
+
kind: "noRoom";
|
|
257
|
+
reason: string;
|
|
258
|
+
};
|
|
259
|
+
meta: object;
|
|
260
|
+
}>;
|
|
261
|
+
}>>;
|
|
203
262
|
installation: import("@trpc/server").TRPCBuiltRouter<{
|
|
204
263
|
ctx: Context;
|
|
205
264
|
meta: object;
|
|
@@ -85,7 +85,7 @@ const JOIN_CODES = {
|
|
|
85
85
|
NAME_TAKEN: 'CONFLICT',
|
|
86
86
|
FLEET_UNAVAILABLE: 'BAD_GATEWAY',
|
|
87
87
|
};
|
|
88
|
-
/** The refusals of listing the machines, as the API states them. */
|
|
88
|
+
/** The refusals of reading the fleet (listing the machines, checking settings), as the API states them. */
|
|
89
89
|
const LIST_CODES = {
|
|
90
90
|
NOT_CONNECTED: 'PRECONDITION_FAILED',
|
|
91
91
|
FLEET_UNAVAILABLE: 'BAD_GATEWAY',
|
|
@@ -97,6 +97,12 @@ const connectionStatusOutputSchema = z.object({
|
|
|
97
97
|
ship: z.object({ shipId: z.string(), name: z.string() }).nullable(),
|
|
98
98
|
lastShipId: z.string().nullable(),
|
|
99
99
|
});
|
|
100
|
+
/** What checking crew settings answers: a trierarch fits, none takes them (naming the settings field at fault), or none has room now. */
|
|
101
|
+
export const checkedSettingsOutputSchema = z.discriminatedUnion('kind', [
|
|
102
|
+
z.object({ kind: z.literal('fits') }),
|
|
103
|
+
z.object({ kind: z.literal('refused'), field: z.string(), reason: z.string() }),
|
|
104
|
+
z.object({ kind: z.literal('noRoom'), reason: z.string() }),
|
|
105
|
+
]);
|
|
100
106
|
/** A joined machine: its trierarch's ship, its starting prompt (decision 0019) and its setup line, each shown once. */
|
|
101
107
|
export const joinedMachineOutputSchema = z.object({
|
|
102
108
|
shipId: idSchema('ship'),
|
|
@@ -169,6 +175,22 @@ export const trierarchPluginRouter = t.router({
|
|
|
169
175
|
}));
|
|
170
176
|
}),
|
|
171
177
|
}),
|
|
178
|
+
requests: t.router({
|
|
179
|
+
/**
|
|
180
|
+
* Whether crew settings would be placed now, by assignment's rules, before
|
|
181
|
+
* the console requests a crew with them (#245). It writes nothing.
|
|
182
|
+
*/
|
|
183
|
+
check: connectedProcedure
|
|
184
|
+
.input(z.object({ settings: z.unknown() }))
|
|
185
|
+
.output(checkedSettingsOutputSchema)
|
|
186
|
+
.query(async ({ ctx, input }) => {
|
|
187
|
+
const checked = await ctx.checkCrewSettings(ctx.fleetId, input.settings);
|
|
188
|
+
if (!checked.isOk) {
|
|
189
|
+
throw new TRPCError({ code: LIST_CODES[checked.error.kind], message: checked.error.message });
|
|
190
|
+
}
|
|
191
|
+
return checked.value;
|
|
192
|
+
}),
|
|
193
|
+
}),
|
|
172
194
|
installation: t.router({
|
|
173
195
|
/** Switches the trierarch plugin on or off for a fleet; off keeps everything of it. A replayed request id answers its first answer. */
|
|
174
196
|
setEnabled: installationProcedure
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../src/adapters/trpc/router.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,QAAQ,EAAE,gBAAgB,EAAE,4BAA4B,EAAgB,MAAM,sBAAsB,CAAC;AACpJ,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../src/adapters/trpc/router.ts"],"names":[],"mappings":"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"}
|
package/dist/app.d.ts
CHANGED
|
@@ -15,7 +15,7 @@ export interface TrierarchPluginApp {
|
|
|
15
15
|
fleetId: FleetId;
|
|
16
16
|
ship: string;
|
|
17
17
|
}[]>;
|
|
18
|
-
/** One assignment pass for every fleet it serves and is connected to; each fleet's refusal is logged, never thrown. */
|
|
18
|
+
/** One assignment pass for every fleet it serves and is connected to, machine labels first; each fleet's refusal is logged, never thrown. */
|
|
19
19
|
assignOnce: () => Promise<{
|
|
20
20
|
fleetId: FleetId;
|
|
21
21
|
outcome: AssignOutcome;
|
package/dist/app.js
CHANGED
|
@@ -18,6 +18,8 @@ import { createReadFleet } from './core/installation/read-fleet.js';
|
|
|
18
18
|
import { createIsServed } from './core/installation/served.js';
|
|
19
19
|
import { createSetFleetEnabled } from './core/installation/set-fleet-enabled.js';
|
|
20
20
|
import { createAssignCrews } from './core/assignment/assign-crews.js';
|
|
21
|
+
import { createLabelMachines } from './core/machines/label-machines.js';
|
|
22
|
+
import { createCheckCrewSettings } from './core/assignment/check-crew-settings.js';
|
|
21
23
|
import { createJoinMachine } from './core/machines/join-machine.js';
|
|
22
24
|
import { createListMachines } from './core/machines/list-machines.js';
|
|
23
25
|
import { createAuthenticateOperator } from './core/operator/authenticate-operator.js';
|
|
@@ -81,12 +83,37 @@ export function createTrierarchPluginApp(options) {
|
|
|
81
83
|
const silentAfterMs = options.silentAfterMs ?? DEFAULT_SILENT_AFTER_MS;
|
|
82
84
|
const listMachines = createListMachines({ door, connections, clock, silentAfterMs });
|
|
83
85
|
const assignCrews = createAssignCrews({ door, connections, clock, silentAfterMs });
|
|
86
|
+
const labelMachines = createLabelMachines({ door, connections });
|
|
87
|
+
/** The fleets whose machine labels were last skipped, so the reason is logged once, not every pass. */
|
|
88
|
+
const skippedLabels = new Set();
|
|
89
|
+
/** Labels each trierarch ship from its machine before placement reads the labels; a refusal is logged and assignment goes on. */
|
|
90
|
+
const labelOnce = async (fleetId) => {
|
|
91
|
+
const labelled = await labelMachines(fleetId);
|
|
92
|
+
if (!labelled.isOk) {
|
|
93
|
+
server.log.warn({ fleet: fleetId, refusal: labelled.error }, 'machine labels refused; the next pass tries again');
|
|
94
|
+
return;
|
|
95
|
+
}
|
|
96
|
+
const { skipped, ...outcome } = labelled.value;
|
|
97
|
+
if (skipped !== undefined) {
|
|
98
|
+
if (!skippedLabels.has(fleetId)) {
|
|
99
|
+
server.log.warn({ fleet: fleetId }, `machine labels skipped: ${skipped}`);
|
|
100
|
+
}
|
|
101
|
+
skippedLabels.add(fleetId);
|
|
102
|
+
return;
|
|
103
|
+
}
|
|
104
|
+
skippedLabels.delete(fleetId);
|
|
105
|
+
if (outcome.defined + outcome.assigned + outcome.unassigned > 0) {
|
|
106
|
+
server.log.info({ fleet: fleetId, ...outcome }, 'machine labels');
|
|
107
|
+
}
|
|
108
|
+
};
|
|
109
|
+
const checkCrewSettings = createCheckCrewSettings({ door, connections, clock, silentAfterMs });
|
|
84
110
|
const assignOnce = async () => {
|
|
85
111
|
const done = [];
|
|
86
112
|
for (const crew of await connections.connected()) {
|
|
87
113
|
if (!(await isServed(crew.fleetId))) {
|
|
88
114
|
continue;
|
|
89
115
|
}
|
|
116
|
+
await labelOnce(crew.fleetId);
|
|
90
117
|
const assigned = await assignCrews(crew.fleetId);
|
|
91
118
|
if (assigned.isOk) {
|
|
92
119
|
done.push({ fleetId: crew.fleetId, outcome: assigned.value });
|
|
@@ -122,6 +149,7 @@ export function createTrierarchPluginApp(options) {
|
|
|
122
149
|
connect,
|
|
123
150
|
joinMachine,
|
|
124
151
|
listMachines,
|
|
152
|
+
checkCrewSettings,
|
|
125
153
|
}),
|
|
126
154
|
},
|
|
127
155
|
};
|
package/dist/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { FleetId } from '@aeolus-fleet/common';
|
|
2
2
|
import type { ConnectionStore, FleetDoor } from '../connection/ports.js';
|
|
3
3
|
import type { Clock } from '../shared/clock.js';
|
|
4
4
|
import { type DomainError } from '../shared/errors.js';
|
|
@@ -1,9 +1,7 @@
|
|
|
1
|
-
import { trierarchReportDetailsSchema } from '@aeolus-fleet/common';
|
|
2
|
-
import { TRIERARCH_TYPE } from '../machines/join-machine.js';
|
|
3
|
-
import { isSilent } from '../machines/silent.js';
|
|
4
1
|
import { refuse } from '../shared/errors.js';
|
|
5
2
|
import { ok } from '../shared/result.js';
|
|
6
3
|
import { place } from './placement.js';
|
|
4
|
+
import { readPlacement } from './read-placement.js';
|
|
7
5
|
/** The refusals that mean the request changed since it was read (claimed, crewed or removed): read again on the next pass. */
|
|
8
6
|
const CHANGED = new Set(['CONFLICT', 'NOT_FOUND']);
|
|
9
7
|
/**
|
|
@@ -22,32 +20,11 @@ export function createAssignCrews(deps) {
|
|
|
22
20
|
if (!crew) {
|
|
23
21
|
return refuse('NOT_CONNECTED', 'The trierarch plugin is not connected to this fleet: connect it in the console');
|
|
24
22
|
}
|
|
25
|
-
const
|
|
26
|
-
if (!
|
|
27
|
-
return unavailable(
|
|
28
|
-
}
|
|
29
|
-
const now = deps.clock.now();
|
|
30
|
-
const trierarchs = [];
|
|
31
|
-
const requests = [];
|
|
32
|
-
for (const ship of listed.value) {
|
|
33
|
-
const isTrierarch = ship.type === TRIERARCH_TYPE && ship.status !== 'retired' && !isSilent(ship.lastSeenAt, { now, silentAfterMs: deps.silentAfterMs });
|
|
34
|
-
const isRequest = ship.status === 'awaitingCrew' && ship.crewRequest !== null && ship.crewRequest.assignedTo === null;
|
|
35
|
-
if (!isTrierarch && !isRequest) {
|
|
36
|
-
continue;
|
|
37
|
-
}
|
|
38
|
-
const read = await deps.door.getShip(crew.crewToken, { shipId: ship.shipId });
|
|
39
|
-
if (!read.isOk) {
|
|
40
|
-
return unavailable(read.error);
|
|
41
|
-
}
|
|
42
|
-
const details = trierarchReportDetailsSchema.safeParse(read.value.report?.details);
|
|
43
|
-
if (isTrierarch && details.success) {
|
|
44
|
-
const assigned = listed.value.filter((each) => each.crewRequest?.assignedTo === ship.shipId).length;
|
|
45
|
-
trierarchs.push({ shipId: ship.shipId, commissionedAt: read.value.commissionedAt, details: details.data, assigned });
|
|
46
|
-
}
|
|
47
|
-
if (isRequest && ship.crewRequest !== null) {
|
|
48
|
-
requests.push({ shipId: ship.shipId, requestedAt: ship.crewRequest.requestedAt, settings: read.value.crewSettings, reason: ship.crewRequest.reason });
|
|
49
|
-
}
|
|
23
|
+
const read = await readPlacement(deps.door, { crewToken: crew.crewToken, now: deps.clock.now(), silentAfterMs: deps.silentAfterMs });
|
|
24
|
+
if (!read.isOk) {
|
|
25
|
+
return unavailable(read.error);
|
|
50
26
|
}
|
|
27
|
+
const { requests, trierarchs } = read.value;
|
|
51
28
|
const outcome = { assigned: 0, explained: 0, lost: 0 };
|
|
52
29
|
for (const placement of place(requests, trierarchs)) {
|
|
53
30
|
const done = placement.kind === 'assign'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assign-crews.js","sourceRoot":"","sources":["../../../src/core/assignment/assign-crews.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"assign-crews.js","sourceRoot":"","sources":["../../../src/core/assignment/assign-crews.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAWpD,8HAA8H;AAC9H,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC;AAEnD;;;;;;;;GAQG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAA4F;IAC5H,MAAM,WAAW,GAAG,CAAC,OAAqB,EAAE,EAAE,CAAC,MAAM,CAAC,mBAAmB,EAAE,4CAA4C,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAC1I,OAAO,KAAK,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,MAAM,CAAC,eAAe,EAAE,gFAAgF,CAAC,CAAC;QACnH,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;QACrI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,OAAO,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC;QACD,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAE5C,MAAM,OAAO,GAAkB,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;QACtE,KAAK,MAAM,SAAS,IAAI,KAAK,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,CAAC;YACpD,MAAM,IAAI,GACR,SAAS,CAAC,IAAI,KAAK,QAAQ;gBACzB,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,eAAe,EAAE,SAAS,CAAC,eAAe,EAAE,CAAC;gBACtH,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;YACjH,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;gBAChD,OAAO,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACjC,CAAC;YACD,IAAI,SAAS,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBACjC,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACzC,CAAC;iBAAM,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;gBACrB,OAAO,CAAC,QAAQ,IAAI,CAAC,CAAC;YACxB,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC;YACpB,CAAC;QACH,CAAC;QACD,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC;IACrB,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type { FleetId } from '@aeolus-fleet/common';
|
|
2
|
+
import type { ConnectionStore, FleetDoor } from '../connection/ports.js';
|
|
3
|
+
import type { Clock } from '../shared/clock.js';
|
|
4
|
+
import { type DomainError } from '../shared/errors.js';
|
|
5
|
+
import { type Result } from '../shared/result.js';
|
|
6
|
+
import { type PlacementCheck } from './placement.js';
|
|
7
|
+
export type CheckCrewSettings = (fleetId: FleetId, settings: unknown) => Promise<Result<PlacementCheck, DomainError<'NOT_CONNECTED' | 'FLEET_UNAVAILABLE'>>>;
|
|
8
|
+
/**
|
|
9
|
+
* Use case: whether crew settings would be placed now, before a request is
|
|
10
|
+
* made (#245): read the fleet's trierarchs as assignment does, and check the
|
|
11
|
+
* settings by placement's rules. It writes nothing; the request itself goes
|
|
12
|
+
* to the fleet, and assignment places it as always.
|
|
13
|
+
*/
|
|
14
|
+
export declare function createCheckCrewSettings(deps: {
|
|
15
|
+
door: FleetDoor;
|
|
16
|
+
connections: ConnectionStore;
|
|
17
|
+
clock: Clock;
|
|
18
|
+
silentAfterMs: number;
|
|
19
|
+
}): CheckCrewSettings;
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { refuse } from '../shared/errors.js';
|
|
2
|
+
import { ok } from '../shared/result.js';
|
|
3
|
+
import { checkPlacement } from './placement.js';
|
|
4
|
+
import { readPlacement } from './read-placement.js';
|
|
5
|
+
/**
|
|
6
|
+
* Use case: whether crew settings would be placed now, before a request is
|
|
7
|
+
* made (#245): read the fleet's trierarchs as assignment does, and check the
|
|
8
|
+
* settings by placement's rules. It writes nothing; the request itself goes
|
|
9
|
+
* to the fleet, and assignment places it as always.
|
|
10
|
+
*/
|
|
11
|
+
export function createCheckCrewSettings(deps) {
|
|
12
|
+
return async (fleetId, settings) => {
|
|
13
|
+
const crew = await deps.connections.find(fleetId);
|
|
14
|
+
if (!crew) {
|
|
15
|
+
return refuse('NOT_CONNECTED', 'The trierarch plugin is not connected to this fleet: connect it in the console');
|
|
16
|
+
}
|
|
17
|
+
const read = await readPlacement(deps.door, { crewToken: crew.crewToken, now: deps.clock.now(), silentAfterMs: deps.silentAfterMs });
|
|
18
|
+
if (!read.isOk) {
|
|
19
|
+
return refuse('FLEET_UNAVAILABLE', `The fleet did not answer the check: ${read.error.message}`);
|
|
20
|
+
}
|
|
21
|
+
return ok(checkPlacement(settings, read.value.trierarchs));
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=check-crew-settings.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"check-crew-settings.js","sourceRoot":"","sources":["../../../src/core/assignment/check-crew-settings.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAuB,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAIpD;;;;;GAKG;AACH,MAAM,UAAU,uBAAuB,CAAC,IAA4F;IAClI,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE;QACjC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,MAAM,CAAC,eAAe,EAAE,gFAAgF,CAAC,CAAC;QACnH,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;QACrI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,OAAO,MAAM,CAAC,mBAAmB,EAAE,uCAAuC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAClG,CAAC;QACD,OAAO,EAAE,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;IAC7D,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -14,6 +14,8 @@ export interface PlacementTrierarch {
|
|
|
14
14
|
details: TrierarchReportDetails;
|
|
15
15
|
/** The requests assigned to it now. */
|
|
16
16
|
assigned: number;
|
|
17
|
+
/** The label values its ship carries, every owner's: what a request's machine labels match (#102). */
|
|
18
|
+
labelValueIds: readonly string[];
|
|
17
19
|
}
|
|
18
20
|
/** What placement decides for a request: the trierarch to claim it for, or why none fits. */
|
|
19
21
|
export type Placement = {
|
|
@@ -25,10 +27,30 @@ export type Placement = {
|
|
|
25
27
|
shipId: ShipId;
|
|
26
28
|
reason: string;
|
|
27
29
|
};
|
|
30
|
+
/**
|
|
31
|
+
* What a settings check answers before a request is made: a trierarch fits;
|
|
32
|
+
* none takes them, naming the settings field at fault; or they fit, but no
|
|
33
|
+
* trierarch has room now, so a request would wait.
|
|
34
|
+
*/
|
|
35
|
+
export type PlacementCheck = {
|
|
36
|
+
kind: 'fits';
|
|
37
|
+
} | {
|
|
38
|
+
kind: 'refused';
|
|
39
|
+
field: string;
|
|
40
|
+
reason: string;
|
|
41
|
+
} | {
|
|
42
|
+
kind: 'noRoom';
|
|
43
|
+
reason: string;
|
|
44
|
+
};
|
|
45
|
+
/**
|
|
46
|
+
* Policy: whether settings would be placed now, before anything is requested
|
|
47
|
+
* (#245): by the same rules as placement, against the trierarchs as they are.
|
|
48
|
+
*/
|
|
49
|
+
export declare function checkPlacement(settings: unknown, trierarchs: readonly PlacementTrierarch[]): PlacementCheck;
|
|
28
50
|
/**
|
|
29
51
|
* Policy: where each unassigned request goes (docs/trierarch.md,
|
|
30
|
-
* "Assignment"). Oldest request first, each to a trierarch
|
|
31
|
-
* harness and workspace, takes its options against the schema it reports for
|
|
52
|
+
* "Assignment"). Oldest request first, each to a trierarch whose ship
|
|
53
|
+
* carries every machine label it names, that offers its harness and workspace, takes its options against the schema it reports for
|
|
32
54
|
* that harness, and has room (its cap above the requests assigned to it);
|
|
33
55
|
* of those, the most room as a share of its cap, then the oldest. What it
|
|
34
56
|
* assigns counts against the room of later requests in the same pass. A
|
|
@@ -1,11 +1,20 @@
|
|
|
1
|
-
import { crewSettingsSchema } from '@aeolus-fleet/common';
|
|
1
|
+
import { crewSettingsSchema, NO_MACHINE_MATCHES_REASON } from '@aeolus-fleet/common';
|
|
2
2
|
import { z } from 'zod';
|
|
3
3
|
/** An issue as one line: its path, when it has one, and its message. */
|
|
4
4
|
function lineOf(issue, prefix = []) {
|
|
5
5
|
const path = [...prefix, ...issue.path.map(String)].join('.');
|
|
6
6
|
return path === '' ? issue.message : `${path}: ${issue.message}`;
|
|
7
7
|
}
|
|
8
|
-
/**
|
|
8
|
+
/** The options the harness's schema declares, by name: an option it does not declare is ignored (#366). */
|
|
9
|
+
function declaredOptions(schema) {
|
|
10
|
+
const { properties } = schema;
|
|
11
|
+
return typeof properties === 'object' && properties !== null && !Array.isArray(properties) ? Object.keys(properties) : [];
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* Why the harness's options schema refuses the options, or undefined when it
|
|
15
|
+
* takes them. Only the options it declares are checked; the rest are ignored
|
|
16
|
+
* (#366). A schema it cannot read refuses them all.
|
|
17
|
+
*/
|
|
9
18
|
function optionsRefusal(schema, options) {
|
|
10
19
|
let checked;
|
|
11
20
|
try {
|
|
@@ -14,7 +23,8 @@ function optionsRefusal(schema, options) {
|
|
|
14
23
|
catch {
|
|
15
24
|
return 'options: the trierarch reports an options schema that cannot be read';
|
|
16
25
|
}
|
|
17
|
-
const
|
|
26
|
+
const declared = declaredOptions(schema);
|
|
27
|
+
const result = checked.safeParse(Object.fromEntries(Object.entries(options).filter(([name]) => declared.includes(name))));
|
|
18
28
|
const [issue] = result.success ? [] : result.error.issues;
|
|
19
29
|
return issue === undefined ? undefined : lineOf(issue, ['options']);
|
|
20
30
|
}
|
|
@@ -28,37 +38,67 @@ function workspaceName(workspace) {
|
|
|
28
38
|
function roomShare(trierarch) {
|
|
29
39
|
return (trierarch.details.caps.ships - trierarch.assigned) / trierarch.details.caps.ships;
|
|
30
40
|
}
|
|
31
|
-
/** The trierarch to claim for the settings, or why none fits: harness, workspace, options, then room. */
|
|
41
|
+
/** The trierarch to claim for the settings, or why none fits: machine labels, harness (the named one, or each trierarch's default), workspace, options, then room. */
|
|
32
42
|
function fit(settings, trierarchs) {
|
|
33
43
|
if (trierarchs.length === 0) {
|
|
34
44
|
return { reason: 'no trierarch reports yet' };
|
|
35
45
|
}
|
|
36
|
-
const
|
|
37
|
-
|
|
46
|
+
const machineLabels = settings.machineLabels ?? [];
|
|
47
|
+
const matching = trierarchs.filter((trierarch) => machineLabels.every((valueId) => trierarch.labelValueIds.includes(valueId)));
|
|
48
|
+
if (matching.length === 0) {
|
|
49
|
+
// Allowed, not refused (#102, Q8): the request waits until a machine carries them all.
|
|
50
|
+
return { reason: NO_MACHINE_MATCHES_REASON };
|
|
51
|
+
}
|
|
52
|
+
// Without a harness, each trierarch crews with its default: the first it reports (#343).
|
|
53
|
+
const named = settings.harness;
|
|
54
|
+
const harnessWords = named ?? 'its default harness';
|
|
55
|
+
const offering = matching.flatMap((trierarch) => {
|
|
56
|
+
const harness = named === undefined ? trierarch.details.harnesses[0] : trierarch.details.harnesses.find((each) => each.harness === named);
|
|
38
57
|
return harness === undefined ? [] : [{ trierarch, harness }];
|
|
39
58
|
});
|
|
40
59
|
if (offering.length === 0) {
|
|
41
|
-
return { reason: `no trierarch offers harness ${
|
|
60
|
+
return { reason: named === undefined ? 'no trierarch offers a harness' : `no trierarch offers harness ${named}`, field: 'harness' };
|
|
42
61
|
}
|
|
43
62
|
const withWorkspace = offering.filter(({ trierarch }) => offersWorkspace(trierarch.details, settings.workspace));
|
|
44
63
|
if (withWorkspace.length === 0) {
|
|
45
|
-
return { reason: `no trierarch offering ${
|
|
64
|
+
return { reason: `no trierarch offering ${harnessWords} has ${workspaceName(settings.workspace)}`, field: 'workspace' };
|
|
46
65
|
}
|
|
47
66
|
const refusals = withWorkspace.map(({ trierarch, harness }) => ({ trierarch, refusal: optionsRefusal(harness.options, settings.options) }));
|
|
48
67
|
const taking = refusals.filter(({ refusal }) => refusal === undefined).map(({ trierarch }) => trierarch);
|
|
49
68
|
const [firstRefusal] = refusals;
|
|
50
69
|
if (taking.length === 0) {
|
|
51
|
-
return { reason: `no trierarch takes these options for ${
|
|
70
|
+
return { reason: `no trierarch takes these options for ${harnessWords}: ${firstRefusal?.refusal ?? ''}`, field: 'options' };
|
|
52
71
|
}
|
|
53
72
|
const [best] = taking
|
|
54
73
|
.filter((trierarch) => trierarch.assigned < trierarch.details.caps.ships)
|
|
55
74
|
.sort((first, second) => roomShare(second) - roomShare(first) || first.commissionedAt.getTime() - second.commissionedAt.getTime() || first.shipId.localeCompare(second.shipId));
|
|
56
75
|
return best === undefined ? { reason: `no trierarch with room: all ${String(taking.length)} that fit are full` } : { trierarch: best };
|
|
57
76
|
}
|
|
77
|
+
/** The settings as crew settings, or why not: the first issue, with the field it is in. */
|
|
78
|
+
function parsed(settings) {
|
|
79
|
+
const result = crewSettingsSchema.safeParse(settings);
|
|
80
|
+
if (result.success) {
|
|
81
|
+
return { settings: result.data };
|
|
82
|
+
}
|
|
83
|
+
const [issue] = result.error.issues;
|
|
84
|
+
return { reason: `settings are not valid crew settings: ${issue === undefined ? 'unreadable' : lineOf(issue)}`, field: issue?.path[0] === undefined ? 'settings' : String(issue.path[0]) };
|
|
85
|
+
}
|
|
86
|
+
/**
|
|
87
|
+
* Policy: whether settings would be placed now, before anything is requested
|
|
88
|
+
* (#245): by the same rules as placement, against the trierarchs as they are.
|
|
89
|
+
*/
|
|
90
|
+
export function checkPlacement(settings, trierarchs) {
|
|
91
|
+
const read = parsed(settings);
|
|
92
|
+
const fitted = 'settings' in read ? fit(read.settings, trierarchs) : read;
|
|
93
|
+
if ('trierarch' in fitted) {
|
|
94
|
+
return { kind: 'fits' };
|
|
95
|
+
}
|
|
96
|
+
return fitted.field === undefined ? { kind: 'noRoom', reason: fitted.reason } : { kind: 'refused', field: fitted.field, reason: fitted.reason };
|
|
97
|
+
}
|
|
58
98
|
/**
|
|
59
99
|
* Policy: where each unassigned request goes (docs/trierarch.md,
|
|
60
|
-
* "Assignment"). Oldest request first, each to a trierarch
|
|
61
|
-
* harness and workspace, takes its options against the schema it reports for
|
|
100
|
+
* "Assignment"). Oldest request first, each to a trierarch whose ship
|
|
101
|
+
* carries every machine label it names, that offers its harness and workspace, takes its options against the schema it reports for
|
|
62
102
|
* that harness, and has room (its cap above the requests assigned to it);
|
|
63
103
|
* of those, the most room as a share of its cap, then the oldest. What it
|
|
64
104
|
* assigns counts against the room of later requests in the same pass. A
|
|
@@ -69,10 +109,10 @@ export function place(requests, trierarchs) {
|
|
|
69
109
|
const placements = [];
|
|
70
110
|
const oldestFirst = [...requests].sort((first, second) => first.requestedAt.getTime() - second.requestedAt.getTime() || first.shipId.localeCompare(second.shipId));
|
|
71
111
|
for (const request of oldestFirst) {
|
|
72
|
-
const
|
|
73
|
-
const fitted = settings
|
|
74
|
-
? fit(settings
|
|
75
|
-
:
|
|
112
|
+
const read = parsed(request.settings);
|
|
113
|
+
const fitted = 'settings' in read
|
|
114
|
+
? fit(read.settings, trierarchs.map((trierarch) => ({ ...trierarch, assigned: assigned.get(trierarch.shipId) ?? trierarch.assigned })))
|
|
115
|
+
: read;
|
|
76
116
|
if ('trierarch' in fitted) {
|
|
77
117
|
assigned.set(fitted.trierarch.shipId, (assigned.get(fitted.trierarch.shipId) ?? 0) + 1);
|
|
78
118
|
placements.push({ kind: 'assign', shipId: request.shipId, trierarchShipId: fitted.trierarch.shipId });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"placement.js","sourceRoot":"","sources":["../../../src/core/assignment/placement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAA+D,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"placement.js","sourceRoot":"","sources":["../../../src/core/assignment/placement.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { FleetDoor, FleetRefusal } from '../connection/ports.js';
|
|
2
|
+
import { type Result } from '../shared/result.js';
|
|
3
|
+
import type { PlacementRequest, PlacementTrierarch } from './placement.js';
|
|
4
|
+
/**
|
|
5
|
+
* What placement reads from the fleet, whole, each time (docs/trierarch.md,
|
|
6
|
+
* "Assignment"): the unassigned requests of ships that await crew, and the
|
|
7
|
+
* trierarchs that report details and are not silent, with the requests
|
|
8
|
+
* assigned to each. A silent trierarch gets nothing new.
|
|
9
|
+
*/
|
|
10
|
+
export declare function readPlacement(door: FleetDoor, at: {
|
|
11
|
+
crewToken: string;
|
|
12
|
+
now: Date;
|
|
13
|
+
silentAfterMs: number;
|
|
14
|
+
}): Promise<Result<{
|
|
15
|
+
requests: PlacementRequest[];
|
|
16
|
+
trierarchs: PlacementTrierarch[];
|
|
17
|
+
}, FleetRefusal>>;
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { trierarchReportDetailsSchema } from '@aeolus-fleet/common';
|
|
2
|
+
import { TRIERARCH_TYPE } from '../machines/join-machine.js';
|
|
3
|
+
import { isSilent } from '../machines/silent.js';
|
|
4
|
+
import { ok } from '../shared/result.js';
|
|
5
|
+
/**
|
|
6
|
+
* What placement reads from the fleet, whole, each time (docs/trierarch.md,
|
|
7
|
+
* "Assignment"): the unassigned requests of ships that await crew, and the
|
|
8
|
+
* trierarchs that report details and are not silent, with the requests
|
|
9
|
+
* assigned to each. A silent trierarch gets nothing new.
|
|
10
|
+
*/
|
|
11
|
+
export async function readPlacement(door, at) {
|
|
12
|
+
const listed = await door.listShips(at.crewToken);
|
|
13
|
+
if (!listed.isOk) {
|
|
14
|
+
return listed;
|
|
15
|
+
}
|
|
16
|
+
const trierarchs = [];
|
|
17
|
+
const requests = [];
|
|
18
|
+
for (const ship of listed.value) {
|
|
19
|
+
const isTrierarch = ship.type === TRIERARCH_TYPE && ship.status !== 'retired' && !isSilent(ship.lastSeenAt, { now: at.now, silentAfterMs: at.silentAfterMs });
|
|
20
|
+
const isRequest = ship.status === 'awaitingCrew' && ship.crewRequest !== null && ship.crewRequest.assignedTo === null;
|
|
21
|
+
if (!isTrierarch && !isRequest) {
|
|
22
|
+
continue;
|
|
23
|
+
}
|
|
24
|
+
const read = await door.getShip(at.crewToken, { shipId: ship.shipId });
|
|
25
|
+
if (!read.isOk) {
|
|
26
|
+
return read;
|
|
27
|
+
}
|
|
28
|
+
const details = trierarchReportDetailsSchema.safeParse(read.value.report?.details);
|
|
29
|
+
if (isTrierarch && details.success) {
|
|
30
|
+
const assigned = listed.value.filter((each) => each.crewRequest?.assignedTo === ship.shipId).length;
|
|
31
|
+
trierarchs.push({ shipId: ship.shipId, commissionedAt: read.value.commissionedAt, details: details.data, assigned, labelValueIds: ship.labels.map((label) => label.valueId) });
|
|
32
|
+
}
|
|
33
|
+
if (isRequest && ship.crewRequest !== null) {
|
|
34
|
+
requests.push({ shipId: ship.shipId, requestedAt: ship.crewRequest.requestedAt, settings: read.value.crewSettings, reason: ship.crewRequest.reason });
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
return ok({ requests, trierarchs });
|
|
38
|
+
}
|
|
39
|
+
//# sourceMappingURL=read-placement.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"read-placement.js","sourceRoot":"","sources":["../../../src/core/assignment/read-placement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AAGpE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAGtD;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,IAAe,EACf,EAA2D;IAE3D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;IAClD,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACjB,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,MAAM,UAAU,GAAyB,EAAE,CAAC;IAC5C,MAAM,QAAQ,GAAuB,EAAE,CAAC;IACxC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QAChC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,KAAK,cAAc,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,aAAa,EAAE,EAAE,CAAC,aAAa,EAAE,CAAC,CAAC;QAC9J,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,KAAK,cAAc,IAAI,IAAI,CAAC,WAAW,KAAK,IAAI,IAAI,IAAI,CAAC,WAAW,CAAC,UAAU,KAAK,IAAI,CAAC;QACtH,IAAI,CAAC,WAAW,IAAI,CAAC,SAAS,EAAE,CAAC;YAC/B,SAAS;QACX,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACvE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,OAAO,GAAG,4BAA4B,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACnF,IAAI,WAAW,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACnC,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,KAAK,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;YACpG,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,cAAc,EAAE,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACjL,CAAC;QACD,IAAI,SAAS,IAAI,IAAI,CAAC,WAAW,KAAK,IAAI,EAAE,CAAC;YAC3C,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;QACxJ,CAAC;IACH,CAAC;IACD,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;AACtC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { CrewLine, FleetId, ShipId } from '@aeolus-fleet/common';
|
|
1
|
+
import type { CrewLine, FleetId, LabelId, LabelValueId, ShipId } from '@aeolus-fleet/common';
|
|
2
2
|
import type { Result } from '../shared/result.js';
|
|
3
3
|
/**
|
|
4
4
|
* Why the fleet refused a ship call: its code (CONFLICT, UNAUTHORIZED,
|
|
@@ -29,6 +29,11 @@ export interface ListedShip {
|
|
|
29
29
|
assignedTo: ShipId | null;
|
|
30
30
|
reason: string | null;
|
|
31
31
|
} | null;
|
|
32
|
+
/** The label values it carries, every owner's, with their labels (#102). */
|
|
33
|
+
labels: {
|
|
34
|
+
labelId: LabelId;
|
|
35
|
+
valueId: LabelValueId;
|
|
36
|
+
}[];
|
|
32
37
|
}
|
|
33
38
|
/** A ship as `fleet.ship` shows it: what the trierarch plugin reads of it. */
|
|
34
39
|
export interface FleetShip {
|
|
@@ -45,6 +50,16 @@ export interface FleetShip {
|
|
|
45
50
|
/** Its crew request's settings, unread; null when it holds no crew request. */
|
|
46
51
|
crewSettings: unknown;
|
|
47
52
|
}
|
|
53
|
+
/** A label of the fleet as `fleet.labels` lists it: its key, its values and the ship that owns it (#102). */
|
|
54
|
+
export interface ListedLabel {
|
|
55
|
+
labelId: LabelId;
|
|
56
|
+
key: string;
|
|
57
|
+
values: {
|
|
58
|
+
valueId: LabelValueId;
|
|
59
|
+
value: string;
|
|
60
|
+
}[];
|
|
61
|
+
ownerShipId: ShipId;
|
|
62
|
+
}
|
|
48
63
|
/**
|
|
49
64
|
* Outbound port: the fleet's public ship calls, as the trierarch plugin makes
|
|
50
65
|
* them for its own ship. The trierarch plugin is a ship like any other
|
|
@@ -89,6 +104,29 @@ export interface FleetDoor {
|
|
|
89
104
|
shipId: ShipId;
|
|
90
105
|
trierarchShipId: ShipId;
|
|
91
106
|
}): Promise<Result<undefined, FleetRefusal>>;
|
|
107
|
+
/** Every label of the fleet, with its owner (fleet:read). */
|
|
108
|
+
listLabels(crewToken: string): Promise<Result<ListedLabel[], FleetRefusal>>;
|
|
109
|
+
/** Defines a label the crew token's ship owns (labels:define); a key the fleet has already is CONFLICT. */
|
|
110
|
+
defineLabel(crewToken: string, label: {
|
|
111
|
+
key: string;
|
|
112
|
+
values: string[];
|
|
113
|
+
}): Promise<Result<{
|
|
114
|
+
labelId: LabelId;
|
|
115
|
+
values: {
|
|
116
|
+
valueId: LabelValueId;
|
|
117
|
+
value: string;
|
|
118
|
+
}[];
|
|
119
|
+
}, FleetRefusal>>;
|
|
120
|
+
/** Puts one of its own label values on a ship (labels:assign). */
|
|
121
|
+
assignLabel(crewToken: string, assignment: {
|
|
122
|
+
shipId: ShipId;
|
|
123
|
+
valueId: LabelValueId;
|
|
124
|
+
}): Promise<Result<undefined, FleetRefusal>>;
|
|
125
|
+
/** Takes one of its own label values off a ship (labels:assign). */
|
|
126
|
+
unassignLabel(crewToken: string, assignment: {
|
|
127
|
+
shipId: ShipId;
|
|
128
|
+
valueId: LabelValueId;
|
|
129
|
+
}): Promise<Result<undefined, FleetRefusal>>;
|
|
92
130
|
/** Writes why no trierarch can take a ship's unassigned crew request (crew:assign). */
|
|
93
131
|
explainCrewRequest(crewToken: string, explanation: {
|
|
94
132
|
shipId: ShipId;
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { type FleetId } from '@aeolus-fleet/common';
|
|
2
|
+
import type { ConnectionStore, FleetDoor } from '../connection/ports.js';
|
|
3
|
+
import { type DomainError } from '../shared/errors.js';
|
|
4
|
+
import { type Result } from '../shared/result.js';
|
|
5
|
+
/** What a pass did: the labels it defined and the values it put on and took off trierarch ships; why it labelled nothing, when it did not. */
|
|
6
|
+
export interface LabelOutcome {
|
|
7
|
+
defined: number;
|
|
8
|
+
assigned: number;
|
|
9
|
+
unassigned: number;
|
|
10
|
+
skipped?: string;
|
|
11
|
+
}
|
|
12
|
+
export type LabelMachines = (fleetId: FleetId) => Promise<Result<LabelOutcome, DomainError<'NOT_CONNECTED' | 'FLEET_UNAVAILABLE'>>>;
|
|
13
|
+
/**
|
|
14
|
+
* Use case: one pass of machine labels for a fleet (docs/trierarch.md,
|
|
15
|
+
* "Machine labels"). The trierarch plugin defines os and arch, which it owns,
|
|
16
|
+
* and labels each trierarch ship with the values its machine reports: the
|
|
17
|
+
* value it reports now goes on first, then any other value of that label comes
|
|
18
|
+
* off. A key another ship owns is left alone. Without the label scopes it
|
|
19
|
+
* labels nothing and says why. Placement reads the labels; a request already
|
|
20
|
+
* assigned stays where it is when they change.
|
|
21
|
+
*/
|
|
22
|
+
export declare function createLabelMachines(deps: {
|
|
23
|
+
door: FleetDoor;
|
|
24
|
+
connections: ConnectionStore;
|
|
25
|
+
}): LabelMachines;
|
|
@@ -0,0 +1,120 @@
|
|
|
1
|
+
import { MACHINE_ARCH, MACHINE_OS, trierarchReportDetailsSchema } from '@aeolus-fleet/common';
|
|
2
|
+
import { refuse } from '../shared/errors.js';
|
|
3
|
+
import { ok } from '../shared/result.js';
|
|
4
|
+
import { TRIERARCH_TYPE } from './join-machine.js';
|
|
5
|
+
/** The machine labels the trierarch plugin owns: each key, its values, and the part of the report it is read from. */
|
|
6
|
+
const MACHINE_KEYS = [
|
|
7
|
+
{ key: 'os', values: MACHINE_OS },
|
|
8
|
+
{ key: 'arch', values: MACHINE_ARCH },
|
|
9
|
+
];
|
|
10
|
+
const LABEL_SCOPES = ['labels:define', 'labels:assign'];
|
|
11
|
+
/** The refusals that mean the fleet changed since it was read (a key taken, a ship or value gone): read again on the next pass. */
|
|
12
|
+
const CHANGED = new Set(['CONFLICT', 'NOT_FOUND']);
|
|
13
|
+
const NO_LABEL_SCOPES = 'its ship holds no label scopes, and scopes never change: retire its ship and connect the trierarch plugin again to label machines';
|
|
14
|
+
/**
|
|
15
|
+
* Use case: one pass of machine labels for a fleet (docs/trierarch.md,
|
|
16
|
+
* "Machine labels"). The trierarch plugin defines os and arch, which it owns,
|
|
17
|
+
* and labels each trierarch ship with the values its machine reports: the
|
|
18
|
+
* value it reports now goes on first, then any other value of that label comes
|
|
19
|
+
* off. A key another ship owns is left alone. Without the label scopes it
|
|
20
|
+
* labels nothing and says why. Placement reads the labels; a request already
|
|
21
|
+
* assigned stays where it is when they change.
|
|
22
|
+
*/
|
|
23
|
+
export function createLabelMachines(deps) {
|
|
24
|
+
const unavailable = (refusal) => refuse('FLEET_UNAVAILABLE', `The fleet did not answer the machine labels: ${refusal.message}`);
|
|
25
|
+
return async (fleetId) => {
|
|
26
|
+
const crew = await deps.connections.find(fleetId);
|
|
27
|
+
if (!crew) {
|
|
28
|
+
return refuse('NOT_CONNECTED', 'The trierarch plugin is not connected to this fleet: connect it in the console');
|
|
29
|
+
}
|
|
30
|
+
const own = await deps.door.getShip(crew.crewToken, { shipId: crew.shipId });
|
|
31
|
+
if (!own.isOk) {
|
|
32
|
+
return unavailable(own.error);
|
|
33
|
+
}
|
|
34
|
+
if (!LABEL_SCOPES.every((scope) => own.value.scopes.includes(scope))) {
|
|
35
|
+
return ok({ defined: 0, assigned: 0, unassigned: 0, skipped: NO_LABEL_SCOPES });
|
|
36
|
+
}
|
|
37
|
+
const done = await labelPass(deps.door, crew);
|
|
38
|
+
return done.isOk ? done : unavailable(done.error);
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
async function settle(done) {
|
|
42
|
+
const result = await done;
|
|
43
|
+
return result.isOk || !CHANGED.has(result.error.code) ? result : ok(undefined);
|
|
44
|
+
}
|
|
45
|
+
async function labelPass(door, crew) {
|
|
46
|
+
const outcome = { defined: 0, assigned: 0, unassigned: 0 };
|
|
47
|
+
const listed = await settle(door.listLabels(crew.crewToken));
|
|
48
|
+
if (!listed.isOk) {
|
|
49
|
+
return listed;
|
|
50
|
+
}
|
|
51
|
+
const labels = new Map();
|
|
52
|
+
for (const { key, values } of MACHINE_KEYS) {
|
|
53
|
+
const label = listed.value?.find((each) => each.key === key);
|
|
54
|
+
if (label !== undefined) {
|
|
55
|
+
if (label.ownerShipId === crew.shipId) {
|
|
56
|
+
labels.set(key, label);
|
|
57
|
+
}
|
|
58
|
+
continue;
|
|
59
|
+
}
|
|
60
|
+
const defined = await settle(door.defineLabel(crew.crewToken, { key, values: [...values] }));
|
|
61
|
+
if (!defined.isOk) {
|
|
62
|
+
return defined;
|
|
63
|
+
}
|
|
64
|
+
if (defined.value !== undefined) {
|
|
65
|
+
labels.set(key, { ...defined.value, key, ownerShipId: crew.shipId });
|
|
66
|
+
outcome.defined += 1;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
const ships = await settle(door.listShips(crew.crewToken));
|
|
70
|
+
if (!ships.isOk) {
|
|
71
|
+
return ships;
|
|
72
|
+
}
|
|
73
|
+
for (const ship of (ships.value ?? []).filter((each) => each.type === TRIERARCH_TYPE && each.status !== 'retired')) {
|
|
74
|
+
const read = await settle(door.getShip(crew.crewToken, { shipId: ship.shipId }));
|
|
75
|
+
if (!read.isOk) {
|
|
76
|
+
return read;
|
|
77
|
+
}
|
|
78
|
+
const details = trierarchReportDetailsSchema.safeParse(read.value?.report?.details);
|
|
79
|
+
const machine = details.success ? details.data.machine : undefined;
|
|
80
|
+
for (const { key } of MACHINE_KEYS) {
|
|
81
|
+
const label = labels.get(key);
|
|
82
|
+
if (label === undefined) {
|
|
83
|
+
continue;
|
|
84
|
+
}
|
|
85
|
+
const relabelled = await relabel(door, {
|
|
86
|
+
crewToken: crew.crewToken,
|
|
87
|
+
ship,
|
|
88
|
+
wanted: label.values.find((each) => each.value === machine?.[key])?.valueId,
|
|
89
|
+
carried: ship.labels.filter((each) => each.labelId === label.labelId).map((each) => each.valueId),
|
|
90
|
+
});
|
|
91
|
+
if (!relabelled.isOk) {
|
|
92
|
+
return relabelled;
|
|
93
|
+
}
|
|
94
|
+
outcome.assigned += relabelled.value.assigned;
|
|
95
|
+
outcome.unassigned += relabelled.value.unassigned;
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
return ok(outcome);
|
|
99
|
+
}
|
|
100
|
+
/** Puts the wanted value on first, so the ship is never without the label while it changes; then takes every other value of the label off. */
|
|
101
|
+
async function relabel(door, change) {
|
|
102
|
+
const { crewToken, ship, wanted, carried } = change;
|
|
103
|
+
const counted = { assigned: 0, unassigned: 0 };
|
|
104
|
+
if (wanted !== undefined && !carried.includes(wanted)) {
|
|
105
|
+
const assigned = await door.assignLabel(crewToken, { shipId: ship.shipId, valueId: wanted });
|
|
106
|
+
if (!assigned.isOk && !CHANGED.has(assigned.error.code)) {
|
|
107
|
+
return assigned;
|
|
108
|
+
}
|
|
109
|
+
counted.assigned += assigned.isOk ? 1 : 0;
|
|
110
|
+
}
|
|
111
|
+
for (const valueId of carried.filter((each) => each !== wanted)) {
|
|
112
|
+
const unassigned = await door.unassignLabel(crewToken, { shipId: ship.shipId, valueId });
|
|
113
|
+
if (!unassigned.isOk && !CHANGED.has(unassigned.error.code)) {
|
|
114
|
+
return unassigned;
|
|
115
|
+
}
|
|
116
|
+
counted.unassigned += unassigned.isOk ? 1 : 0;
|
|
117
|
+
}
|
|
118
|
+
return ok(counted);
|
|
119
|
+
}
|
|
120
|
+
//# sourceMappingURL=label-machines.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"label-machines.js","sourceRoot":"","sources":["../../../src/core/machines/label-machines.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aeolus-fleet/trierarch-plugin",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.20.1",
|
|
4
4
|
"description": "Aeolus trierarch plugin: brings machines into the fleet and assigns crew requests to their trierarchs, as a ship of the fleet.",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"type": "module",
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"postpack": "rm LICENSE"
|
|
40
40
|
},
|
|
41
41
|
"dependencies": {
|
|
42
|
-
"@aeolus-fleet/common": "0.
|
|
42
|
+
"@aeolus-fleet/common": "0.20.1",
|
|
43
43
|
"@prisma/adapter-pg": "^7.10.0",
|
|
44
44
|
"@prisma/client": "^7.10.0",
|
|
45
45
|
"@trpc/server": "^11.19.0",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"zod": "^4.6.5"
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|
|
51
|
-
"@aeolus-fleet/core": "0.
|
|
51
|
+
"@aeolus-fleet/core": "0.20.1",
|
|
52
52
|
"@testcontainers/postgresql": "^12.2.0"
|
|
53
53
|
}
|
|
54
54
|
}
|