@aeolus-fleet/trierarch-plugin 0.0.0 → 0.19.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/LICENSE +201 -0
- package/README.md +38 -1
- package/dist/adapters/crypto/idempotency-keys.d.ts +3 -0
- package/dist/adapters/crypto/idempotency-keys.js +4 -0
- package/dist/adapters/crypto/idempotency-keys.js.map +1 -0
- package/dist/adapters/crypto/request-hasher.d.ts +3 -0
- package/dist/adapters/crypto/request-hasher.js +4 -0
- package/dist/adapters/crypto/request-hasher.js.map +1 -0
- package/dist/adapters/fleet/console-sessions.d.ts +2 -0
- package/dist/adapters/fleet/console-sessions.js +23 -0
- package/dist/adapters/fleet/console-sessions.js.map +1 -0
- package/dist/adapters/fleet/rest-fleet-door.d.ts +2 -0
- package/dist/adapters/fleet/rest-fleet-door.js +103 -0
- package/dist/adapters/fleet/rest-fleet-door.js.map +1 -0
- package/dist/adapters/http/version.d.ts +6 -0
- package/dist/adapters/http/version.js +12 -0
- package/dist/adapters/http/version.js.map +1 -0
- package/dist/adapters/prisma/client.d.ts +10 -0
- package/dist/adapters/prisma/client.js +20 -0
- package/dist/adapters/prisma/client.js.map +1 -0
- package/dist/adapters/prisma/connection-store.d.ts +4 -0
- package/dist/adapters/prisma/connection-store.js +28 -0
- package/dist/adapters/prisma/connection-store.js.map +1 -0
- package/dist/adapters/prisma/fleet-forgetter.d.ts +4 -0
- package/dist/adapters/prisma/fleet-forgetter.js +10 -0
- package/dist/adapters/prisma/fleet-forgetter.js.map +1 -0
- package/dist/adapters/prisma/fleet-switches.d.ts +4 -0
- package/dist/adapters/prisma/fleet-switches.js +10 -0
- package/dist/adapters/prisma/fleet-switches.js.map +1 -0
- package/dist/adapters/prisma/generated/browser.d.ts +24 -0
- package/dist/adapters/prisma/generated/browser.js +18 -0
- package/dist/adapters/prisma/generated/browser.js.map +1 -0
- package/dist/adapters/prisma/generated/client.d.ts +43 -0
- package/dist/adapters/prisma/generated/client.js +38 -0
- package/dist/adapters/prisma/generated/client.js.map +1 -0
- package/dist/adapters/prisma/generated/commonInputTypes.d.ts +235 -0
- package/dist/adapters/prisma/generated/commonInputTypes.js +11 -0
- package/dist/adapters/prisma/generated/commonInputTypes.js.map +1 -0
- package/dist/adapters/prisma/generated/enums.d.ts +1 -0
- package/dist/adapters/prisma/generated/enums.js +12 -0
- package/dist/adapters/prisma/generated/enums.js.map +1 -0
- package/dist/adapters/prisma/generated/internal/class.d.ts +154 -0
- package/dist/adapters/prisma/generated/internal/class.js +50 -0
- package/dist/adapters/prisma/generated/internal/class.js.map +1 -0
- package/dist/adapters/prisma/generated/internal/prismaNamespace.d.ts +766 -0
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js +117 -0
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js.map +1 -0
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.d.ts +78 -0
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js +87 -0
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js.map +1 -0
- package/dist/adapters/prisma/generated/models/Connection.d.ts +1011 -0
- package/dist/adapters/prisma/generated/models/Connection.js +2 -0
- package/dist/adapters/prisma/generated/models/Connection.js.map +1 -0
- package/dist/adapters/prisma/generated/models/FleetSwitch.d.ts +945 -0
- package/dist/adapters/prisma/generated/models/FleetSwitch.js +2 -0
- package/dist/adapters/prisma/generated/models/FleetSwitch.js.map +1 -0
- package/dist/adapters/prisma/generated/models/InstallationRequest.d.ts +1030 -0
- package/dist/adapters/prisma/generated/models/InstallationRequest.js +2 -0
- package/dist/adapters/prisma/generated/models/InstallationRequest.js.map +1 -0
- package/dist/adapters/prisma/generated/models.d.ts +4 -0
- package/dist/adapters/prisma/generated/models.js +2 -0
- package/dist/adapters/prisma/generated/models.js.map +1 -0
- package/dist/adapters/prisma/installation-requests.d.ts +4 -0
- package/dist/adapters/prisma/installation-requests.js +25 -0
- package/dist/adapters/prisma/installation-requests.js.map +1 -0
- package/dist/adapters/prisma/migrate.d.ts +5 -0
- package/dist/adapters/prisma/migrate.js +40 -0
- package/dist/adapters/prisma/migrate.js.map +1 -0
- package/dist/adapters/trpc/router.d.ts +244 -0
- package/dist/adapters/trpc/router.js +205 -0
- package/dist/adapters/trpc/router.js.map +1 -0
- package/dist/app.d.ts +42 -0
- package/dist/app.js +177 -0
- package/dist/app.js.map +1 -0
- package/dist/bin/aeolus-trierarch-plugin.d.ts +2 -0
- package/dist/bin/aeolus-trierarch-plugin.js +61 -0
- package/dist/bin/aeolus-trierarch-plugin.js.map +1 -0
- package/dist/config.d.ts +32 -0
- package/dist/config.js +49 -0
- package/dist/config.js.map +1 -0
- package/dist/core/assignment/assign-crews.d.ts +27 -0
- package/dist/core/assignment/assign-crews.js +72 -0
- package/dist/core/assignment/assign-crews.js.map +1 -0
- package/dist/core/assignment/placement.d.ts +37 -0
- package/dist/core/assignment/placement.js +86 -0
- package/dist/core/assignment/placement.js.map +1 -0
- package/dist/core/connection/connect.d.ts +26 -0
- package/dist/core/connection/connect.js +44 -0
- package/dist/core/connection/connect.js.map +1 -0
- package/dist/core/connection/ports.d.ts +139 -0
- package/dist/core/connection/ports.js +2 -0
- package/dist/core/connection/ports.js.map +1 -0
- package/dist/core/connection/read-connection.d.ts +14 -0
- package/dist/core/connection/read-connection.js +24 -0
- package/dist/core/connection/read-connection.js.map +1 -0
- package/dist/core/installation/delete-fleet.d.ts +21 -0
- package/dist/core/installation/delete-fleet.js +21 -0
- package/dist/core/installation/delete-fleet.js.map +1 -0
- package/dist/core/installation/ports.d.ts +46 -0
- package/dist/core/installation/ports.js +2 -0
- package/dist/core/installation/ports.js.map +1 -0
- package/dist/core/installation/read-fleet.d.ts +18 -0
- package/dist/core/installation/read-fleet.js +9 -0
- package/dist/core/installation/read-fleet.js.map +1 -0
- package/dist/core/installation/request-id.d.ts +8 -0
- package/dist/core/installation/request-id.js +10 -0
- package/dist/core/installation/request-id.js.map +1 -0
- package/dist/core/installation/served.d.ts +12 -0
- package/dist/core/installation/served.js +8 -0
- package/dist/core/installation/served.js.map +1 -0
- package/dist/core/installation/set-fleet-enabled.d.ts +24 -0
- package/dist/core/installation/set-fleet-enabled.js +21 -0
- package/dist/core/installation/set-fleet-enabled.js.map +1 -0
- package/dist/core/machines/join-machine.d.ts +40 -0
- package/dist/core/machines/join-machine.js +35 -0
- package/dist/core/machines/join-machine.js.map +1 -0
- package/dist/core/machines/list-machines.d.ts +34 -0
- package/dist/core/machines/list-machines.js +47 -0
- package/dist/core/machines/list-machines.js.map +1 -0
- package/dist/core/machines/ports.d.ts +4 -0
- package/dist/core/machines/ports.js +2 -0
- package/dist/core/machines/ports.js.map +1 -0
- package/dist/core/machines/silent.d.ts +9 -0
- package/dist/core/machines/silent.js +9 -0
- package/dist/core/machines/silent.js.map +1 -0
- package/dist/core/operator/authenticate-operator.d.ts +21 -0
- package/dist/core/operator/authenticate-operator.js +26 -0
- package/dist/core/operator/authenticate-operator.js.map +1 -0
- package/dist/core/operator/ports.d.ts +15 -0
- package/dist/core/operator/ports.js +2 -0
- package/dist/core/operator/ports.js.map +1 -0
- package/dist/core/shared/clock.d.ts +4 -0
- package/dist/core/shared/clock.js +2 -0
- package/dist/core/shared/clock.js.map +1 -0
- package/dist/core/shared/errors.d.ts +10 -0
- package/dist/core/shared/errors.js +6 -0
- package/dist/core/shared/errors.js.map +1 -0
- package/dist/core/shared/result.d.ts +16 -0
- package/dist/core/shared/result.js +7 -0
- package/dist/core/shared/result.js.map +1 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.js +3 -0
- package/dist/index.js.map +1 -0
- package/package.json +47 -3
- package/prisma.config.ts +18 -0
- package/src/adapters/prisma/migrations/20261006220000_init/migration.sql +35 -0
- package/src/adapters/prisma/migrations/migration_lock.toml +3 -0
- package/src/adapters/prisma/schema.prisma +58 -0
package/dist/app.js
ADDED
|
@@ -0,0 +1,177 @@
|
|
|
1
|
+
import { fastifyTRPCPlugin } from '@trpc/server/adapters/fastify';
|
|
2
|
+
import Fastify, {} from 'fastify';
|
|
3
|
+
import { randomIdempotencyKeys } from './adapters/crypto/idempotency-keys.js';
|
|
4
|
+
import { sha256RequestHasher } from './adapters/crypto/request-hasher.js';
|
|
5
|
+
import { createFleetConsoleSessions } from './adapters/fleet/console-sessions.js';
|
|
6
|
+
import { createRestFleetDoor } from './adapters/fleet/rest-fleet-door.js';
|
|
7
|
+
import { runningVersion } from './adapters/http/version.js';
|
|
8
|
+
import { checkDatabase, createPrismaClient, latestMigration } from './adapters/prisma/client.js';
|
|
9
|
+
import { createPrismaConnectionStore } from './adapters/prisma/connection-store.js';
|
|
10
|
+
import { createPrismaFleetForgetter } from './adapters/prisma/fleet-forgetter.js';
|
|
11
|
+
import { createPrismaFleetSwitches } from './adapters/prisma/fleet-switches.js';
|
|
12
|
+
import { createPrismaInstallationRequests } from './adapters/prisma/installation-requests.js';
|
|
13
|
+
import { trierarchPluginRouter } from './adapters/trpc/router.js';
|
|
14
|
+
import { createConnect } from './core/connection/connect.js';
|
|
15
|
+
import { createReadConnection } from './core/connection/read-connection.js';
|
|
16
|
+
import { createDeleteFleet } from './core/installation/delete-fleet.js';
|
|
17
|
+
import { createReadFleet } from './core/installation/read-fleet.js';
|
|
18
|
+
import { createIsServed } from './core/installation/served.js';
|
|
19
|
+
import { createSetFleetEnabled } from './core/installation/set-fleet-enabled.js';
|
|
20
|
+
import { createAssignCrews } from './core/assignment/assign-crews.js';
|
|
21
|
+
import { createJoinMachine } from './core/machines/join-machine.js';
|
|
22
|
+
import { createListMachines } from './core/machines/list-machines.js';
|
|
23
|
+
import { createAuthenticateOperator } from './core/operator/authenticate-operator.js';
|
|
24
|
+
export const systemClock = { now: () => new Date() };
|
|
25
|
+
/** A trierarch is silent once its last seen is older than this, unless the configuration says otherwise. */
|
|
26
|
+
const DEFAULT_SILENT_AFTER_MS = 300_000;
|
|
27
|
+
/**
|
|
28
|
+
* The trierarch plugin wired to its own database and to the fleet's public
|
|
29
|
+
* API. A pure API: the console's server calls it, with the console's session
|
|
30
|
+
* cookie; it needs no public address of its own.
|
|
31
|
+
*/
|
|
32
|
+
export function createTrierarchPluginApp(options) {
|
|
33
|
+
const prisma = createPrismaClient(options.databaseUrl);
|
|
34
|
+
const server = Fastify({ logger: options.logger ?? true });
|
|
35
|
+
const connections = createPrismaConnectionStore(prisma);
|
|
36
|
+
const installation = options.installationToken === undefined ? 'open' : 'enabled';
|
|
37
|
+
const switches = createPrismaFleetSwitches(prisma);
|
|
38
|
+
const isServed = createIsServed({ installation, switches });
|
|
39
|
+
// From what the trierarch plugin holds, without asking any fleet: health and version stay quick.
|
|
40
|
+
const connectedFleets = async () => (await connections.connected()).length;
|
|
41
|
+
// The version this process runs and its database's latest migration. No authentication, no fleet data.
|
|
42
|
+
const version = runningVersion();
|
|
43
|
+
server.get('/api/version', async () => {
|
|
44
|
+
let migration = null;
|
|
45
|
+
try {
|
|
46
|
+
migration = await latestMigration(prisma);
|
|
47
|
+
}
|
|
48
|
+
catch (error) {
|
|
49
|
+
server.log.error({ err: error }, 'latest migration unknown');
|
|
50
|
+
}
|
|
51
|
+
return { trierarchPlugin: version, migration, connectedFleets: await connectedFleets(), installation };
|
|
52
|
+
});
|
|
53
|
+
// Up and its database reachable.
|
|
54
|
+
server.get('/api/health', async (_request, reply) => {
|
|
55
|
+
try {
|
|
56
|
+
await checkDatabase(prisma);
|
|
57
|
+
return { status: 'ok', connectedFleets: await connectedFleets(), installation };
|
|
58
|
+
}
|
|
59
|
+
catch (error) {
|
|
60
|
+
server.log.error({ err: error }, 'database unreachable');
|
|
61
|
+
return reply.code(503).send({ status: 'unavailable' });
|
|
62
|
+
}
|
|
63
|
+
});
|
|
64
|
+
const clock = options.clock ?? systemClock;
|
|
65
|
+
const door = createRestFleetDoor(options.fleetUrl);
|
|
66
|
+
const readConnection = createReadConnection({ door, store: connections });
|
|
67
|
+
// A fleet's connection as the trierarch plugin holds it, asking the fleet nothing: what a fleet that is off reads.
|
|
68
|
+
const heldConnection = async (fleetId) => {
|
|
69
|
+
const crew = await connections.find(fleetId);
|
|
70
|
+
if (crew) {
|
|
71
|
+
return { state: 'connected', ship: { shipId: crew.shipId, name: crew.name }, lastShipId: crew.shipId };
|
|
72
|
+
}
|
|
73
|
+
return { state: 'not-connected', ship: null, lastShipId: (await connections.binding(fleetId))?.shipId ?? null };
|
|
74
|
+
};
|
|
75
|
+
const requests = createPrismaInstallationRequests(prisma);
|
|
76
|
+
const setFleetEnabled = createSetFleetEnabled({ switches, requests, hasher: sha256RequestHasher, clock });
|
|
77
|
+
const readFleet = createReadFleet({ isServed, connections });
|
|
78
|
+
const deleteFleet = createDeleteFleet({ forgetter: createPrismaFleetForgetter(prisma), requests, hasher: sha256RequestHasher, clock });
|
|
79
|
+
const connect = createConnect({ door, store: connections, clock });
|
|
80
|
+
const joinMachine = createJoinMachine({ door, connections, keys: randomIdempotencyKeys, fleetUrl: options.fleetUrl });
|
|
81
|
+
const silentAfterMs = options.silentAfterMs ?? DEFAULT_SILENT_AFTER_MS;
|
|
82
|
+
const listMachines = createListMachines({ door, connections, clock, silentAfterMs });
|
|
83
|
+
const assignCrews = createAssignCrews({ door, connections, clock, silentAfterMs });
|
|
84
|
+
const assignOnce = async () => {
|
|
85
|
+
const done = [];
|
|
86
|
+
for (const crew of await connections.connected()) {
|
|
87
|
+
if (!(await isServed(crew.fleetId))) {
|
|
88
|
+
continue;
|
|
89
|
+
}
|
|
90
|
+
const assigned = await assignCrews(crew.fleetId);
|
|
91
|
+
if (assigned.isOk) {
|
|
92
|
+
done.push({ fleetId: crew.fleetId, outcome: assigned.value });
|
|
93
|
+
}
|
|
94
|
+
else {
|
|
95
|
+
server.log.warn({ fleet: crew.fleetId, refusal: assigned.error }, 'assignment pass refused; the next pass tries again');
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
return done;
|
|
99
|
+
};
|
|
100
|
+
let assigning;
|
|
101
|
+
const trpc = {
|
|
102
|
+
prefix: '/trpc',
|
|
103
|
+
trpcOptions: {
|
|
104
|
+
router: trierarchPluginRouter,
|
|
105
|
+
onError: ({ error, path }) => {
|
|
106
|
+
if (error.code === 'INTERNAL_SERVER_ERROR') {
|
|
107
|
+
server.log.error({ err: error.cause ?? error, path }, 'procedure failed');
|
|
108
|
+
}
|
|
109
|
+
},
|
|
110
|
+
createContext: ({ req }) => ({
|
|
111
|
+
cookie: req.headers.cookie,
|
|
112
|
+
authenticateOperator: createAuthenticateOperator({ sessions: createFleetConsoleSessions(options.fleetUrl) }),
|
|
113
|
+
isConnected: async (fleetId) => (await connections.find(fleetId)) !== undefined,
|
|
114
|
+
isServed,
|
|
115
|
+
heldConnection,
|
|
116
|
+
installationTokenSent: typeof req.headers['x-aeolus-installation-token'] === 'string' ? req.headers['x-aeolus-installation-token'] : undefined,
|
|
117
|
+
installation: { mode: installation, token: options.installationToken },
|
|
118
|
+
setFleetEnabled,
|
|
119
|
+
readFleet,
|
|
120
|
+
deleteFleet,
|
|
121
|
+
readConnection,
|
|
122
|
+
connect,
|
|
123
|
+
joinMachine,
|
|
124
|
+
listMachines,
|
|
125
|
+
}),
|
|
126
|
+
},
|
|
127
|
+
};
|
|
128
|
+
void server.register(fastifyTRPCPlugin, trpc);
|
|
129
|
+
server.addHook('onClose', async () => {
|
|
130
|
+
clearInterval(assigning);
|
|
131
|
+
await prisma.$disconnect();
|
|
132
|
+
});
|
|
133
|
+
return {
|
|
134
|
+
server,
|
|
135
|
+
restoreConnections: async () => {
|
|
136
|
+
const restored = [];
|
|
137
|
+
for (const crew of await connections.connected()) {
|
|
138
|
+
// A fleet that is off rests: its connection waits, unread, for it to be on again.
|
|
139
|
+
if (!(await isServed(crew.fleetId))) {
|
|
140
|
+
continue;
|
|
141
|
+
}
|
|
142
|
+
const connection = await readConnection(crew.fleetId);
|
|
143
|
+
if (connection.state === 'connected') {
|
|
144
|
+
restored.push({ fleetId: crew.fleetId, ship: connection.ship?.name ?? crew.name });
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
return restored;
|
|
148
|
+
},
|
|
149
|
+
assignOnce,
|
|
150
|
+
startAssigning: (intervalMs) => {
|
|
151
|
+
// One pass at a time: a pass that outlasts the interval makes the next one wait.
|
|
152
|
+
let isPassing = false;
|
|
153
|
+
assigning = setInterval(() => {
|
|
154
|
+
if (isPassing) {
|
|
155
|
+
return;
|
|
156
|
+
}
|
|
157
|
+
isPassing = true;
|
|
158
|
+
assignOnce()
|
|
159
|
+
.then((done) => {
|
|
160
|
+
for (const { fleetId, outcome } of done) {
|
|
161
|
+
if (outcome.assigned + outcome.explained + outcome.lost > 0) {
|
|
162
|
+
server.log.info({ fleet: fleetId, ...outcome }, 'assignment pass');
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
})
|
|
166
|
+
.catch((error) => {
|
|
167
|
+
server.log.error({ err: error }, 'assignment pass failed; the next pass tries again');
|
|
168
|
+
})
|
|
169
|
+
.finally(() => {
|
|
170
|
+
isPassing = false;
|
|
171
|
+
});
|
|
172
|
+
}, intervalMs);
|
|
173
|
+
},
|
|
174
|
+
close: () => server.close(),
|
|
175
|
+
};
|
|
176
|
+
}
|
|
177
|
+
//# sourceMappingURL=app.js.map
|
package/dist/app.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
/**
|
|
3
|
+
* `aeolus-trierarch-plugin start`: migrates the trierarch plugin's database,
|
|
4
|
+
* connects again to every fleet with its kept crew token (a fleet without one
|
|
5
|
+
* is not connected until its operator connects the trierarch plugin in the
|
|
6
|
+
* console), then serves and runs an assignment pass every interval until
|
|
7
|
+
* SIGINT or SIGTERM. `aeolus-trierarch-plugin
|
|
8
|
+
* migrate`: migrates the database alone.
|
|
9
|
+
*/
|
|
10
|
+
import { MigrationError, migrateDatabase } from '../adapters/prisma/migrate.js';
|
|
11
|
+
import { createTrierarchPluginApp } from '../app.js';
|
|
12
|
+
import { ConfigError, loadConfig, loadDatabaseUrl } from '../config.js';
|
|
13
|
+
const USAGE = 'Usage: aeolus-trierarch-plugin start | migrate';
|
|
14
|
+
async function start() {
|
|
15
|
+
const config = loadConfig(process.env);
|
|
16
|
+
await migrateDatabase(config.databaseUrl);
|
|
17
|
+
const app = createTrierarchPluginApp({
|
|
18
|
+
databaseUrl: config.databaseUrl,
|
|
19
|
+
fleetUrl: config.fleetUrl,
|
|
20
|
+
logger: { level: config.logLevel },
|
|
21
|
+
silentAfterMs: config.silentAfterMs,
|
|
22
|
+
...(config.installationToken === undefined ? {} : { installationToken: config.installationToken }),
|
|
23
|
+
});
|
|
24
|
+
const restored = await app.restoreConnections();
|
|
25
|
+
for (const { fleetId, ship } of restored) {
|
|
26
|
+
app.server.log.info({ fleet: fleetId, ship }, "connected as the trierarch plugin's ship");
|
|
27
|
+
}
|
|
28
|
+
if (restored.length === 0) {
|
|
29
|
+
app.server.log.warn('connected to no fleet: an operator connects the trierarch plugin in the console');
|
|
30
|
+
}
|
|
31
|
+
app.startAssigning(config.passIntervalMs);
|
|
32
|
+
for (const signal of ['SIGINT', 'SIGTERM']) {
|
|
33
|
+
process.once(signal, () => {
|
|
34
|
+
void app.close().then(() => process.exit(0));
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
await app.server.listen({ host: config.host, port: config.port });
|
|
38
|
+
}
|
|
39
|
+
try {
|
|
40
|
+
switch (process.argv[2] ?? '') {
|
|
41
|
+
case 'start':
|
|
42
|
+
await start();
|
|
43
|
+
break;
|
|
44
|
+
case 'migrate':
|
|
45
|
+
await migrateDatabase(loadDatabaseUrl(process.env));
|
|
46
|
+
break;
|
|
47
|
+
default:
|
|
48
|
+
process.stderr.write(`${USAGE}\n`);
|
|
49
|
+
process.exitCode = 2;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
catch (error) {
|
|
53
|
+
if (error instanceof ConfigError || error instanceof MigrationError) {
|
|
54
|
+
process.stderr.write(`${error.message}\n`);
|
|
55
|
+
process.exitCode = 1;
|
|
56
|
+
}
|
|
57
|
+
else {
|
|
58
|
+
throw error;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
//# sourceMappingURL=aeolus-trierarch-plugin.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"aeolus-trierarch-plugin.js","sourceRoot":"","sources":["../../src/bin/aeolus-trierarch-plugin.ts"],"names":[],"mappings":";AACA;;;;;;;GAOG;AACH,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAExE,MAAM,KAAK,GAAG,gDAAgD,CAAC;AAE/D,KAAK,UAAU,KAAK;IAClB,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACvC,MAAM,eAAe,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC1C,MAAM,GAAG,GAAG,wBAAwB,CAAC;QACnC,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,QAAQ,EAAE;QAClC,aAAa,EAAE,MAAM,CAAC,aAAa;QACnC,GAAG,CAAC,MAAM,CAAC,iBAAiB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,MAAM,CAAC,iBAAiB,EAAE,CAAC;KACnG,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,kBAAkB,EAAE,CAAC;IAChD,KAAK,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,QAAQ,EAAE,CAAC;QACzC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,0CAA0C,CAAC,CAAC;IAC5F,CAAC;IACD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,iFAAiF,CAAC,CAAC;IACzG,CAAC;IAED,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAE1C,KAAK,MAAM,MAAM,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAU,EAAE,CAAC;QACpD,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE;YACxB,KAAK,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;IACL,CAAC;IACD,MAAM,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;AACpE,CAAC;AAED,IAAI,CAAC;IACH,QAAQ,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;QAC9B,KAAK,OAAO;YACV,MAAM,KAAK,EAAE,CAAC;YACd,MAAM;QACR,KAAK,SAAS;YACZ,MAAM,eAAe,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;YACpD,MAAM;QACR;YACE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC;YACnC,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;IACzB,CAAC;AACH,CAAC;AAAC,OAAO,KAAK,EAAE,CAAC;IACf,IAAI,KAAK,YAAY,WAAW,IAAI,KAAK,YAAY,cAAc,EAAE,CAAC;QACpE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;QAC3C,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;IACvB,CAAC;SAAM,CAAC;QACN,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}
|
package/dist/config.d.ts
ADDED
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
export interface Config {
|
|
2
|
+
/** The trierarch plugin's own database (decision 0030), which may share the Postgres server with the fleet and squadrons. */
|
|
3
|
+
databaseUrl: string;
|
|
4
|
+
/**
|
|
5
|
+
* The fleet's public URL, where the trierarch plugin calls the ship API as
|
|
6
|
+
* its ship and checks console sessions, and which a joining machine's setup
|
|
7
|
+
* line names. Not a secret; fixed here, so no caller can point the trierarch
|
|
8
|
+
* plugin at another fleet. Its ship's secret is never configured: the
|
|
9
|
+
* operator connects the trierarch plugin in the console.
|
|
10
|
+
*/
|
|
11
|
+
fleetUrl: string;
|
|
12
|
+
host: string;
|
|
13
|
+
port: number;
|
|
14
|
+
logLevel: string;
|
|
15
|
+
/**
|
|
16
|
+
* The token a hosting service presents to the installation procedures
|
|
17
|
+
* (decision 0021). Unset, they are off and every fleet is served, as
|
|
18
|
+
* a self-hosted trierarch plugin needs; set, a fleet is served once switched on.
|
|
19
|
+
*/
|
|
20
|
+
installationToken: string | undefined;
|
|
21
|
+
/** A trierarch whose last seen is older than this is silent: it gets no new requests, and keeps those it holds. */
|
|
22
|
+
silentAfterMs: number;
|
|
23
|
+
/** How often the assignment runs a pass for each fleet it serves and is connected to. */
|
|
24
|
+
passIntervalMs: number;
|
|
25
|
+
}
|
|
26
|
+
export declare class ConfigError extends Error {
|
|
27
|
+
name: string;
|
|
28
|
+
}
|
|
29
|
+
/** The configuration from the environment; throws a ConfigError naming every variable that is wrong. */
|
|
30
|
+
export declare function loadConfig(environment: Record<string, string | undefined>): Config;
|
|
31
|
+
/** The database URL alone, for `aeolus-trierarch-plugin migrate`. */
|
|
32
|
+
export declare function loadDatabaseUrl(environment: Record<string, string | undefined>): string;
|
package/dist/config.js
ADDED
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
/** The shortest installation token the trierarch plugin takes, as the fleet core does (decision 0020). */
|
|
3
|
+
const INSTALLATION_TOKEN_MIN_LENGTH = 32;
|
|
4
|
+
/** A trierarch is silent once its last seen is older than this, by default (docs/trierarch.md, "Assignment"). */
|
|
5
|
+
const DEFAULT_SILENT_AFTER_SECONDS = 300;
|
|
6
|
+
/** How often the assignment runs a pass per fleet, by default. */
|
|
7
|
+
const DEFAULT_PASS_INTERVAL_SECONDS = 10;
|
|
8
|
+
const MS_PER_SECOND = 1000;
|
|
9
|
+
const environmentSchema = z.object({
|
|
10
|
+
DATABASE_URL: z.url({ protocol: /^postgres(ql)?$/, error: 'must be a postgres:// or postgresql:// URL' }),
|
|
11
|
+
FLEET_URL: z.url({ protocol: /^https?$/, error: 'must be an http:// or https:// URL' }),
|
|
12
|
+
HOST: z.string().min(1).default('127.0.0.1'),
|
|
13
|
+
PORT: z.coerce.number().int().min(0).max(65_535).default(4200),
|
|
14
|
+
LOG_LEVEL: z.enum(['fatal', 'error', 'warn', 'info', 'debug', 'trace', 'silent']).default('info'),
|
|
15
|
+
INSTALLATION_TOKEN: z.string().min(INSTALLATION_TOKEN_MIN_LENGTH, { error: `must hold at least ${String(INSTALLATION_TOKEN_MIN_LENGTH)} characters` }).optional(),
|
|
16
|
+
TRIERARCH_SILENT_AFTER_SECONDS: z.coerce.number().int().positive().default(DEFAULT_SILENT_AFTER_SECONDS),
|
|
17
|
+
TRIERARCH_PASS_INTERVAL_SECONDS: z.coerce.number().int().positive().default(DEFAULT_PASS_INTERVAL_SECONDS),
|
|
18
|
+
});
|
|
19
|
+
/** What `aeolus-trierarch-plugin migrate` reads: the database alone. */
|
|
20
|
+
const databaseEnvironmentSchema = environmentSchema.pick({ DATABASE_URL: true });
|
|
21
|
+
export class ConfigError extends Error {
|
|
22
|
+
name = 'ConfigError';
|
|
23
|
+
}
|
|
24
|
+
function parsed(schema, environment) {
|
|
25
|
+
const result = schema.safeParse(environment);
|
|
26
|
+
if (!result.success) {
|
|
27
|
+
throw new ConfigError(result.error.issues.map((issue) => `${issue.path.join('.')}: ${issue.message}`).join('\n'));
|
|
28
|
+
}
|
|
29
|
+
return result.data;
|
|
30
|
+
}
|
|
31
|
+
/** The configuration from the environment; throws a ConfigError naming every variable that is wrong. */
|
|
32
|
+
export function loadConfig(environment) {
|
|
33
|
+
const variables = parsed(environmentSchema, environment);
|
|
34
|
+
return {
|
|
35
|
+
databaseUrl: variables.DATABASE_URL,
|
|
36
|
+
fleetUrl: variables.FLEET_URL.replace(/\/$/, ''),
|
|
37
|
+
host: variables.HOST,
|
|
38
|
+
port: variables.PORT,
|
|
39
|
+
logLevel: variables.LOG_LEVEL,
|
|
40
|
+
installationToken: variables.INSTALLATION_TOKEN,
|
|
41
|
+
silentAfterMs: variables.TRIERARCH_SILENT_AFTER_SECONDS * MS_PER_SECOND,
|
|
42
|
+
passIntervalMs: variables.TRIERARCH_PASS_INTERVAL_SECONDS * MS_PER_SECOND,
|
|
43
|
+
};
|
|
44
|
+
}
|
|
45
|
+
/** The database URL alone, for `aeolus-trierarch-plugin migrate`. */
|
|
46
|
+
export function loadDatabaseUrl(environment) {
|
|
47
|
+
return parsed(databaseEnvironmentSchema, environment).DATABASE_URL;
|
|
48
|
+
}
|
|
49
|
+
//# sourceMappingURL=config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,27 @@
|
|
|
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
|
+
/** What a pass did: the claims it won, the reasons it wrote, and the claims another assigner or a change won first. */
|
|
7
|
+
export interface AssignOutcome {
|
|
8
|
+
assigned: number;
|
|
9
|
+
explained: number;
|
|
10
|
+
lost: number;
|
|
11
|
+
}
|
|
12
|
+
export type AssignCrews = (fleetId: FleetId) => Promise<Result<AssignOutcome, DomainError<'NOT_CONNECTED' | 'FLEET_UNAVAILABLE'>>>;
|
|
13
|
+
/**
|
|
14
|
+
* Use case: one pass of assignment for a fleet (docs/trierarch.md,
|
|
15
|
+
* "Assignment"). It reads the fleet whole each time: the unassigned requests
|
|
16
|
+
* of ships that await crew, and the trierarchs that report details and are
|
|
17
|
+
* not silent, with the requests assigned to each. Placement decides; each
|
|
18
|
+
* claim is optimistic, and one the fleet refuses because the request changed
|
|
19
|
+
* is no error: the next pass reads it again. A silent trierarch gets nothing
|
|
20
|
+
* new and keeps what it holds.
|
|
21
|
+
*/
|
|
22
|
+
export declare function createAssignCrews(deps: {
|
|
23
|
+
door: FleetDoor;
|
|
24
|
+
connections: ConnectionStore;
|
|
25
|
+
clock: Clock;
|
|
26
|
+
silentAfterMs: number;
|
|
27
|
+
}): AssignCrews;
|
|
@@ -0,0 +1,72 @@
|
|
|
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 { refuse } from '../shared/errors.js';
|
|
5
|
+
import { ok } from '../shared/result.js';
|
|
6
|
+
import { place } from './placement.js';
|
|
7
|
+
/** The refusals that mean the request changed since it was read (claimed, crewed or removed): read again on the next pass. */
|
|
8
|
+
const CHANGED = new Set(['CONFLICT', 'NOT_FOUND']);
|
|
9
|
+
/**
|
|
10
|
+
* Use case: one pass of assignment for a fleet (docs/trierarch.md,
|
|
11
|
+
* "Assignment"). It reads the fleet whole each time: the unassigned requests
|
|
12
|
+
* of ships that await crew, and the trierarchs that report details and are
|
|
13
|
+
* not silent, with the requests assigned to each. Placement decides; each
|
|
14
|
+
* claim is optimistic, and one the fleet refuses because the request changed
|
|
15
|
+
* is no error: the next pass reads it again. A silent trierarch gets nothing
|
|
16
|
+
* new and keeps what it holds.
|
|
17
|
+
*/
|
|
18
|
+
export function createAssignCrews(deps) {
|
|
19
|
+
const unavailable = (refusal) => refuse('FLEET_UNAVAILABLE', `The fleet did not answer the assignment: ${refusal.message}`);
|
|
20
|
+
return async (fleetId) => {
|
|
21
|
+
const crew = await deps.connections.find(fleetId);
|
|
22
|
+
if (!crew) {
|
|
23
|
+
return refuse('NOT_CONNECTED', 'The trierarch plugin is not connected to this fleet: connect it in the console');
|
|
24
|
+
}
|
|
25
|
+
const listed = await deps.door.listShips(crew.crewToken);
|
|
26
|
+
if (!listed.isOk) {
|
|
27
|
+
return unavailable(listed.error);
|
|
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
|
+
}
|
|
50
|
+
}
|
|
51
|
+
const outcome = { assigned: 0, explained: 0, lost: 0 };
|
|
52
|
+
for (const placement of place(requests, trierarchs)) {
|
|
53
|
+
const done = placement.kind === 'assign'
|
|
54
|
+
? await deps.door.assignCrew(crew.crewToken, { shipId: placement.shipId, trierarchShipId: placement.trierarchShipId })
|
|
55
|
+
: await deps.door.explainCrewRequest(crew.crewToken, { shipId: placement.shipId, reason: placement.reason });
|
|
56
|
+
if (!done.isOk && !CHANGED.has(done.error.code)) {
|
|
57
|
+
return unavailable(done.error);
|
|
58
|
+
}
|
|
59
|
+
if (placement.kind === 'explain') {
|
|
60
|
+
outcome.explained += done.isOk ? 1 : 0;
|
|
61
|
+
}
|
|
62
|
+
else if (done.isOk) {
|
|
63
|
+
outcome.assigned += 1;
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
outcome.lost += 1;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
return ok(outcome);
|
|
70
|
+
};
|
|
71
|
+
}
|
|
72
|
+
//# sourceMappingURL=assign-crews.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"assign-crews.js","sourceRoot":"","sources":["../../../src/core/assignment/assign-crews.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import { type ShipId, type TrierarchReportDetails } from '@aeolus-fleet/common';
|
|
2
|
+
/** An unassigned crew request whose ship awaits crew: its settings as the fleet holds them, and the reason written on it now. */
|
|
3
|
+
export interface PlacementRequest {
|
|
4
|
+
shipId: ShipId;
|
|
5
|
+
requestedAt: Date;
|
|
6
|
+
/** Unread: placement parses them as crew settings. */
|
|
7
|
+
settings: unknown;
|
|
8
|
+
reason: string | null;
|
|
9
|
+
}
|
|
10
|
+
/** A trierarch that may take requests: one that reports details and is not silent. */
|
|
11
|
+
export interface PlacementTrierarch {
|
|
12
|
+
shipId: ShipId;
|
|
13
|
+
commissionedAt: Date;
|
|
14
|
+
details: TrierarchReportDetails;
|
|
15
|
+
/** The requests assigned to it now. */
|
|
16
|
+
assigned: number;
|
|
17
|
+
}
|
|
18
|
+
/** What placement decides for a request: the trierarch to claim it for, or why none fits. */
|
|
19
|
+
export type Placement = {
|
|
20
|
+
kind: 'assign';
|
|
21
|
+
shipId: ShipId;
|
|
22
|
+
trierarchShipId: ShipId;
|
|
23
|
+
} | {
|
|
24
|
+
kind: 'explain';
|
|
25
|
+
shipId: ShipId;
|
|
26
|
+
reason: string;
|
|
27
|
+
};
|
|
28
|
+
/**
|
|
29
|
+
* Policy: where each unassigned request goes (docs/trierarch.md,
|
|
30
|
+
* "Assignment"). Oldest request first, each to a trierarch that offers its
|
|
31
|
+
* harness and workspace, takes its options against the schema it reports for
|
|
32
|
+
* that harness, and has room (its cap above the requests assigned to it);
|
|
33
|
+
* of those, the most room as a share of its cap, then the oldest. What it
|
|
34
|
+
* assigns counts against the room of later requests in the same pass. A
|
|
35
|
+
* request none fits gets the reason, unless that reason is written already.
|
|
36
|
+
*/
|
|
37
|
+
export declare function place(requests: readonly PlacementRequest[], trierarchs: readonly PlacementTrierarch[]): Placement[];
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
import { crewSettingsSchema } from '@aeolus-fleet/common';
|
|
2
|
+
import { z } from 'zod';
|
|
3
|
+
/** An issue as one line: its path, when it has one, and its message. */
|
|
4
|
+
function lineOf(issue, prefix = []) {
|
|
5
|
+
const path = [...prefix, ...issue.path.map(String)].join('.');
|
|
6
|
+
return path === '' ? issue.message : `${path}: ${issue.message}`;
|
|
7
|
+
}
|
|
8
|
+
/** Why the harness's options schema refuses the options, or undefined when it takes them. A schema it cannot read refuses them all. */
|
|
9
|
+
function optionsRefusal(schema, options) {
|
|
10
|
+
let checked;
|
|
11
|
+
try {
|
|
12
|
+
checked = z.fromJSONSchema(schema);
|
|
13
|
+
}
|
|
14
|
+
catch {
|
|
15
|
+
return 'options: the trierarch reports an options schema that cannot be read';
|
|
16
|
+
}
|
|
17
|
+
const result = checked.safeParse(options);
|
|
18
|
+
const [issue] = result.success ? [] : result.error.issues;
|
|
19
|
+
return issue === undefined ? undefined : lineOf(issue, ['options']);
|
|
20
|
+
}
|
|
21
|
+
function offersWorkspace(details, workspace) {
|
|
22
|
+
return workspace.kind === 'worktree' ? details.workspaces.repositories.includes(workspace.repository) : details.workspaces.folders.includes(workspace.name);
|
|
23
|
+
}
|
|
24
|
+
function workspaceName(workspace) {
|
|
25
|
+
return workspace.kind === 'worktree' ? `repository ${workspace.repository}` : `folder ${workspace.name}`;
|
|
26
|
+
}
|
|
27
|
+
/** Room left as a share of its cap: what placement compares. */
|
|
28
|
+
function roomShare(trierarch) {
|
|
29
|
+
return (trierarch.details.caps.ships - trierarch.assigned) / trierarch.details.caps.ships;
|
|
30
|
+
}
|
|
31
|
+
/** The trierarch to claim for the settings, or why none fits: harness, workspace, options, then room. */
|
|
32
|
+
function fit(settings, trierarchs) {
|
|
33
|
+
if (trierarchs.length === 0) {
|
|
34
|
+
return { reason: 'no trierarch reports yet' };
|
|
35
|
+
}
|
|
36
|
+
const offering = trierarchs.flatMap((trierarch) => {
|
|
37
|
+
const harness = trierarch.details.harnesses.find((each) => each.harness === settings.harness);
|
|
38
|
+
return harness === undefined ? [] : [{ trierarch, harness }];
|
|
39
|
+
});
|
|
40
|
+
if (offering.length === 0) {
|
|
41
|
+
return { reason: `no trierarch offers harness ${settings.harness}` };
|
|
42
|
+
}
|
|
43
|
+
const withWorkspace = offering.filter(({ trierarch }) => offersWorkspace(trierarch.details, settings.workspace));
|
|
44
|
+
if (withWorkspace.length === 0) {
|
|
45
|
+
return { reason: `no trierarch offering ${settings.harness} has ${workspaceName(settings.workspace)}` };
|
|
46
|
+
}
|
|
47
|
+
const refusals = withWorkspace.map(({ trierarch, harness }) => ({ trierarch, refusal: optionsRefusal(harness.options, settings.options) }));
|
|
48
|
+
const taking = refusals.filter(({ refusal }) => refusal === undefined).map(({ trierarch }) => trierarch);
|
|
49
|
+
const [firstRefusal] = refusals;
|
|
50
|
+
if (taking.length === 0) {
|
|
51
|
+
return { reason: `no trierarch takes these options for ${settings.harness}: ${firstRefusal?.refusal ?? ''}` };
|
|
52
|
+
}
|
|
53
|
+
const [best] = taking
|
|
54
|
+
.filter((trierarch) => trierarch.assigned < trierarch.details.caps.ships)
|
|
55
|
+
.sort((first, second) => roomShare(second) - roomShare(first) || first.commissionedAt.getTime() - second.commissionedAt.getTime() || first.shipId.localeCompare(second.shipId));
|
|
56
|
+
return best === undefined ? { reason: `no trierarch with room: all ${String(taking.length)} that fit are full` } : { trierarch: best };
|
|
57
|
+
}
|
|
58
|
+
/**
|
|
59
|
+
* Policy: where each unassigned request goes (docs/trierarch.md,
|
|
60
|
+
* "Assignment"). Oldest request first, each to a trierarch that offers its
|
|
61
|
+
* harness and workspace, takes its options against the schema it reports for
|
|
62
|
+
* that harness, and has room (its cap above the requests assigned to it);
|
|
63
|
+
* of those, the most room as a share of its cap, then the oldest. What it
|
|
64
|
+
* assigns counts against the room of later requests in the same pass. A
|
|
65
|
+
* request none fits gets the reason, unless that reason is written already.
|
|
66
|
+
*/
|
|
67
|
+
export function place(requests, trierarchs) {
|
|
68
|
+
const assigned = new Map(trierarchs.map((trierarch) => [trierarch.shipId, trierarch.assigned]));
|
|
69
|
+
const placements = [];
|
|
70
|
+
const oldestFirst = [...requests].sort((first, second) => first.requestedAt.getTime() - second.requestedAt.getTime() || first.shipId.localeCompare(second.shipId));
|
|
71
|
+
for (const request of oldestFirst) {
|
|
72
|
+
const settings = crewSettingsSchema.safeParse(request.settings);
|
|
73
|
+
const fitted = settings.success
|
|
74
|
+
? fit(settings.data, trierarchs.map((trierarch) => ({ ...trierarch, assigned: assigned.get(trierarch.shipId) ?? trierarch.assigned })))
|
|
75
|
+
: { reason: `settings are not valid crew settings: ${settings.error.issues[0] === undefined ? 'unreadable' : lineOf(settings.error.issues[0])}` };
|
|
76
|
+
if ('trierarch' in fitted) {
|
|
77
|
+
assigned.set(fitted.trierarch.shipId, (assigned.get(fitted.trierarch.shipId) ?? 0) + 1);
|
|
78
|
+
placements.push({ kind: 'assign', shipId: request.shipId, trierarchShipId: fitted.trierarch.shipId });
|
|
79
|
+
}
|
|
80
|
+
else if (fitted.reason !== request.reason) {
|
|
81
|
+
placements.push({ kind: 'explain', shipId: request.shipId, reason: fitted.reason });
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
return placements;
|
|
85
|
+
}
|
|
86
|
+
//# sourceMappingURL=placement.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"placement.js","sourceRoot":"","sources":["../../../src/core/assignment/placement.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import type { FleetId, ShipId } from '@aeolus-fleet/common';
|
|
2
|
+
import type { Clock } from '../shared/clock.js';
|
|
3
|
+
import { type DomainError } from '../shared/errors.js';
|
|
4
|
+
import { type Result } from '../shared/result.js';
|
|
5
|
+
import type { ConnectionStatus, FleetDoor, ConnectionStore } from './ports.js';
|
|
6
|
+
export type ConnectRefusal = DomainError<'ALREADY_CONNECTED' | 'SECRET_REFUSED' | 'OTHER_FLEET' | 'MISSING_SCOPES'>;
|
|
7
|
+
export type Connect = (input: {
|
|
8
|
+
operatorFleetId: FleetId;
|
|
9
|
+
shipId: ShipId;
|
|
10
|
+
secret: string;
|
|
11
|
+
}) => Promise<Result<ConnectionStatus, ConnectRefusal>>;
|
|
12
|
+
/**
|
|
13
|
+
* Use case: the operator connects the trierarch plugin, as squadrons is
|
|
14
|
+
* connected. The console's server hands it its ship's secret, server to
|
|
15
|
+
* server; the trierarch plugin registers with it as a server and keeps only
|
|
16
|
+
* the crew token. The ship must be of the operator's fleet and hold
|
|
17
|
+
* fleet:read, fleet:manage and crew:assign, or the trierarch plugin lets it go
|
|
18
|
+
* again and keeps nothing. Each fleet has its own connection: connect works
|
|
19
|
+
* only while the trierarch plugin is not connected to the operator's fleet,
|
|
20
|
+
* whatever other fleets it serves. The secret is never kept or logged.
|
|
21
|
+
*/
|
|
22
|
+
export declare function createConnect(deps: {
|
|
23
|
+
door: FleetDoor;
|
|
24
|
+
store: ConnectionStore;
|
|
25
|
+
clock: Clock;
|
|
26
|
+
}): Connect;
|