@rcpooley/concord 0.6.2 → 0.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -392,8 +392,8 @@ makes up a missed one.
392
392
  **`cloudflare`** — a declared zone is shared. Every record the module writes
393
393
  carries a comment marked `concord:<id>`, and only marked records are ever
394
394
  edited or deleted; anything else in the zone is reported once per run and left
395
- alone. It is the systemd sweeper's rule (`X-Concord=1`) rather than the docker
396
- sweeper's: the module can only ever remove what it created.
395
+ alone. It is the sweepers' rule (`X-Concord=1` on units, the `dev.concord.app`
396
+ label on containers): the module can only ever remove what it created.
397
397
 
398
398
  That is what lets a human co-own a zone — add a record in the dashboard and
399
399
  Concord will not touch it. The cost is that Concord will not adopt one either:
package/dist/cli/main.js CHANGED
File without changes
package/dist/daemon.js CHANGED
File without changes
@@ -2,21 +2,24 @@ import { Module } from '../../module.js';
2
2
  import type { DockerOp } from './index.js';
3
3
  import type { HostConfig } from '../../schema.js';
4
4
  /**
5
- * End-of-run host-truth enforcement for containers — the porkbun rule applied
6
- * to hosts: the declared set is the WHOLE truth, because nothing runs a
7
- * container outside Concord (schema 8).
5
+ * End-of-run host-truth enforcement for the containers Concord created: a
6
+ * container carrying Concord's project label (`dev.concord.app`) that no docker
7
+ * module on the host declares any more is removed within a cycle. That is how
8
+ * deleting an app file, or moving it to another host, takes its container
9
+ * down. What it will NEVER remove: volumes. Containers are reproducible; the
10
+ * data under them is not.
8
11
  *
9
- * Unlike the systemd sweeper, which can only remove what carries the tag
10
- * Concord wrote, this removes ANY live container no docker module on the host
11
- * declares — labelled or not. That is deliberate and approved: an unowned
12
- * container is drift whether Concord created it or a hand-run `docker run`
13
- * did, and it is removed within a cycle. What it will NEVER remove: volumes.
14
- * Containers are reproducible; the data under them is not.
12
+ * By default (`containerSweep: 'labelled'`, since 0.7.0) this is the systemd
13
+ * sweeper's rule: Concord removes only what it created. A container with no
14
+ * Concord label (a hand-run `docker run`, or another deployer such as
15
+ * Bellwether sharing the host under its own `dev.bellwether.*` labels) is not
16
+ * Concord's to judge, and is left alone. Every container Concord starts gets
17
+ * the label, because the docker module's rendered compose project always
18
+ * writes it (render.ts), so nothing Concord made escapes the sweep.
15
19
  *
16
- * The exception is per HOST, not per container: a host declaring
17
- * `containerSweep: 'labelled'` (a dev machine, where hand-run containers are
18
- * the work) gets a sweeper that only removes containers carrying Concord's
19
- * label. Concord still cleans up its own orphans there.
20
+ * A host may opt back into the old rule, `containerSweep: 'all'`: ANY live
21
+ * container no module declares is removed, labelled or not, for a host where
22
+ * nothing but Concord may run a container. It was the default until 0.7.0.
20
23
  *
21
24
  * Never declared in config. The loader synthesizes one per registry host and
22
25
  * appends it after every declared module, so removals run last: a moved app
@@ -1 +1 @@
1
- {"version":3,"file":"sweeper.d.ts","sourceRoot":"","sources":["../../../src/modules/docker/sweeper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAGxC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAC1C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IACtB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,gBAAgB,EAAE,CAAA;CAC5B;AAED,4DAA4D;AAC5D,MAAM,MAAM,cAAc,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAAA;AAKzD;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAC1B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,EACzB,IAAI,GAAE,cAAsB,GAC3B,gBAAgB,EAAE,CAcpB;AAED,qBAAa,aAAc,SAAQ,MAAM,CAAC,gBAAgB,EAAE,QAAQ,CAAC;IAKjE,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IALvB,SAAkB,IAAI,YAAW;gBAG/B,IAAI,EAAE,MAAM,EACK,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,EACzB,IAAI,GAAE,cAAsB;IAKzC,OAAO,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAI1C;8EAC0E;IACpE,IAAI,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAUvC,IAAI,CAAC,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,GAAG,QAAQ,EAAE;IAkBhE,KAAK,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAoB5C"}
1
+ {"version":3,"file":"sweeper.d.ts","sourceRoot":"","sources":["../../../src/modules/docker/sweeper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAGxC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAC1C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IACtB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,gBAAgB,EAAE,CAAA;CAC5B;AAED,4DAA4D;AAC5D,MAAM,MAAM,cAAc,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAAA;AAKzD;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAC1B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,EACzB,IAAI,GAAE,cAA2B,GAChC,gBAAgB,EAAE,CAepB;AAED,qBAAa,aAAc,SAAQ,MAAM,CAAC,gBAAgB,EAAE,QAAQ,CAAC;IAKjE,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IALvB,SAAkB,IAAI,YAAW;gBAG/B,IAAI,EAAE,MAAM,EACK,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,EACzB,IAAI,GAAE,cAA2B;IAK9C,OAAO,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAI1C;8EAC0E;IACpE,IAAI,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAUvC,IAAI,CAAC,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,GAAG,QAAQ,EAAE;IAkBhE,KAAK,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAoB5C"}
@@ -12,7 +12,7 @@ const sq = (s) => `'${s.replace(/'/g, `'\\''`)}'`;
12
12
  * name is treated as no project at all: the container is still removed, just
13
13
  * directly rather than via compose (and never through a path built from it).
14
14
  */
15
- export function parseUnowned(stdout, keep, mode = 'all') {
15
+ export function parseUnowned(stdout, keep, mode = 'labelled') {
16
16
  const strays = [];
17
17
  for (const line of stdout.split('\n')) {
18
18
  if (!line.trim())
@@ -20,8 +20,9 @@ export function parseUnowned(stdout, keep, mode = 'all') {
20
20
  const [name, label, image, status] = line.split('\t');
21
21
  if (!name)
22
22
  continue;
23
- // `labelled`: a container with no Concord label is not Concord's to judge.
24
- // Keyed on the RAW label, so a forged-but-present value is still swept.
23
+ // `labelled` (the default): a container with no Concord label is not
24
+ // Concord's to judge — someone else started it. Keyed on the RAW label,
25
+ // so a forged-but-present value is still swept.
25
26
  if (mode === 'labelled' && !label)
26
27
  continue;
27
28
  const project = label && /^[a-z0-9][a-z0-9-]*$/.test(label) ? label : null;
@@ -35,7 +36,7 @@ export class DockerSweeper extends Module {
35
36
  keep;
36
37
  mode;
37
38
  kind = 'docker';
38
- constructor(host, keep, mode = 'all') {
39
+ constructor(host, keep, mode = 'labelled') {
39
40
  super('sweep', host);
40
41
  this.keep = keep;
41
42
  this.mode = mode;
@@ -1 +1 @@
1
- {"version":3,"file":"sweeper.js","sourceRoot":"","sources":["../../../src/modules/docker/sweeper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sweeper.js","sourceRoot":"","sources":["../../../src/modules/docker/sweeper.ts"],"names":[],"mappings":"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"}
package/dist/schema.d.ts CHANGED
@@ -67,6 +67,9 @@ export type HostRegistry = z.input<typeof HostRegistrySchema>;
67
67
  * appears. What did NOT change: the docker sweeper still removes ANY
68
68
  * undeclared container, labelled or not — unlike the
69
69
  * systemd sweeper, which only ever removes what carries Concord's tag.
70
+ * (Since 0.7.0 the default host `containerSweep` is `labelled`, so by
71
+ * default the docker sweeper follows systemd's rule too. Not a shape
72
+ * change, so no bump: `all` is still accepted, as an opt-in.)
70
73
  * 7: systemd units became HOST-TRUTH, the way containers did in 6 — but as a
71
74
  * property of the module KIND, not of the config. Every rendered unit
72
75
  * carries `X-Concord=1`; the loader synthesizes one sweeper per host that
@@ -1 +1 @@
1
- {"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAGvB;;;;;;;;;;GAUG;AACH,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;kBAiCZ,CAAA;AAEX,wEAAwE;AACxE,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;mBAc3B,CAAA;AAEJ,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,UAAU,CAAC,CAAA;AACpD,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAA;AAU7D;;;;;;;;;;GAUG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;AACH,eAAO,MAAM,cAAc,IAAI,CAAA;AAE/B;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4BAS7B,CAAA;AAEF;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,kBAAkB,CAAC,CAAA;AAE9D;;;;;;GAMG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAA;AAElE;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc;;;;kBAuBhB,CAAA;AAEX,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,cAAc,CAAC,CAAA;AAEtD,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAYrB,CAAA;AAEX;;;;;;;;;;;;;GAaG;AACH;;;;GAIG;AACH,KAAK,QAAQ,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAC3D,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG;IAAE,IAAI,EAAE,CAAC,CAAA;CAAE,GAC7B,CAAC,CAAA;AAEL,MAAM,MAAM,aAAa,CAAC,EAAE,SAAS,YAAY,GAAG,YAAY,IAAI;IAClE,aAAa,EAAE,OAAO,cAAc,CAAA;IACpC,KAAK,EAAE,EAAE,CAAA;IACT,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAA;IACzC,OAAO,EAAE,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC,MAAM,EAAE,EAAE,MAAM,CAAC,CAAC,EAAE,CAAA;CAClE,CAAA"}
1
+ {"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAGvB;;;;;;;;;;GAUG;AACH,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;kBAyCZ,CAAA;AAEX,wEAAwE;AACxE,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;mBAc3B,CAAA;AAEJ,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,UAAU,CAAC,CAAA;AACpD,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAA;AAU7D;;;;;;;;;;GAUG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AACH,eAAO,MAAM,cAAc,IAAI,CAAA;AAE/B;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4BAS7B,CAAA;AAEF;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,kBAAkB,CAAC,CAAA;AAE9D;;;;;;GAMG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAA;AAElE;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc;;;;kBAuBhB,CAAA;AAEX,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,cAAc,CAAC,CAAA;AAEtD,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAYrB,CAAA;AAEX;;;;;;;;;;;;;GAaG;AACH;;;;GAIG;AACH,KAAK,QAAQ,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAC3D,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG;IAAE,IAAI,EAAE,CAAC,CAAA;CAAE,GAC7B,CAAC,CAAA;AAEL,MAAM,MAAM,aAAa,CAAC,EAAE,SAAS,YAAY,GAAG,YAAY,IAAI;IAClE,aAAa,EAAE,OAAO,cAAc,CAAA;IACpC,KAAK,EAAE,EAAE,CAAA;IACT,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAA;IACzC,OAAO,EAAE,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC,MAAM,EAAE,EAAE,MAAM,CAAC,CAAC,EAAE,CAAA;CAClE,CAAA"}
package/dist/schema.js CHANGED
@@ -35,14 +35,22 @@ export const HostSchema = z
35
35
  */
36
36
  skipIfUnreachable: z.boolean().default(false),
37
37
  /**
38
- * What this host's docker sweep may remove. `all` (the default) removes ANY container no module declares,
39
- * labelled or not. `labelled` removes only containers carrying Concord's
40
- * project label: Concord still cleans up after itself, but containers
41
- * something else started are left alone. For a development machine, where
42
- * sessions run `docker run` / `compose up` by hand and those containers
43
- * are the work, not drift. A property of the MACHINE, like the flag above.
38
+ * What this host's docker sweep may remove. `labelled` (the default)
39
+ * removes only containers carrying Concord's project label
40
+ * (`dev.concord.app`) that no module declares: Concord cleans up after
41
+ * itself, and containers something else started (a hand-run `docker run`,
42
+ * another deployer sharing the host) are left alone. `all` removes ANY
43
+ * container no module declares, labelled or not, for a host where nothing
44
+ * but Concord may run a container. Opt-in only: it would remove every
45
+ * container another deployer runs there. A property of the MACHINE, like
46
+ * the flag above.
47
+ *
48
+ * The default was `all` until 0.7.0. Flipping it removed nothing: every
49
+ * container Concord starts goes through the docker module's rendered
50
+ * compose project, which always carries the label, so `labelled` only
51
+ * ever spares containers Concord did not create.
44
52
  */
45
- containerSweep: z.enum(['all', 'labelled']).default('all'),
53
+ containerSweep: z.enum(['all', 'labelled']).default('labelled'),
46
54
  })
47
55
  .strict();
48
56
  /** Hosts by name. Module `host` fields are typed against these keys. */
@@ -91,6 +99,9 @@ import { CloudflareConfigSchema } from './modules/cloudflare/schema.js';
91
99
  * appears. What did NOT change: the docker sweeper still removes ANY
92
100
  * undeclared container, labelled or not — unlike the
93
101
  * systemd sweeper, which only ever removes what carries Concord's tag.
102
+ * (Since 0.7.0 the default host `containerSweep` is `labelled`, so by
103
+ * default the docker sweeper follows systemd's rule too. Not a shape
104
+ * change, so no bump: `all` is still accepted, as an opt-in.)
94
105
  * 7: systemd units became HOST-TRUTH, the way containers did in 6 — but as a
95
106
  * property of the module KIND, not of the config. Every rendered unit
96
107
  * carries `X-Concord=1`; the loader synthesizes one sweeper per host that
@@ -1 +1 @@
1
- {"version":3,"file":"schema.js","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"schema.js","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rcpooley/concord",
3
- "version": "0.6.2",
3
+ "version": "0.7.0",
4
4
  "description": "Declarative config reconciler: edit a typed config repo, push it, and your hosts converge. Also exports the schema library config repos import.",
5
5
  "license": "MIT",
6
6
  "homepage": "https://github.com/rcpooley/concord#readme",
package/dist/ui.d.ts DELETED
@@ -1,62 +0,0 @@
1
- import { type IncomingMessage, type Server, type ServerResponse } from 'node:http';
2
- import { type PlanService } from './plans.js';
3
- /**
4
- * The daemon's own UI and API: recent reconciles, plans on request.
5
- *
6
- * It listens on a unix socket SEPARATE from the webhook's. Expose it only on a
7
- * private network (a VPN, a LAN, an ssh tunnel), never publicly. The two
8
- * sockets are the whole security model: the public listener stays an HMAC
9
- * check and a poke, and nothing here is reachable from the internet even if a
10
- * route is misconfigured to point at the wrong one — the wrong one does not
11
- * serve these paths.
12
- *
13
- * There is no auth beyond that private network, deliberately: nothing here
14
- * changes production. The only write is "plan this branch", which reads.
15
- *
16
- * Like the webhook, this is never load-bearing: a dead listener means no UI,
17
- * never a missed reconcile.
18
- */
19
- /** One real reconcile, as the daemon recorded it. */
20
- export interface RunRecord {
21
- id: string;
22
- /** What asked for it: `interval`, `startup`, `webhook`, `SIGHUP`. */
23
- trigger: string;
24
- status: 'running' | 'converged' | 'changed' | 'aborted' | 'error';
25
- startedAt: string;
26
- finishedAt?: string;
27
- /** Config commit that was reconciled. */
28
- sha?: string;
29
- totalOps?: number;
30
- /** The closing line — "converged", "3 change(s) …", "ABORTED at …". */
31
- summary?: string;
32
- log: string[];
33
- }
34
- export type RunSummary = Omit<RunRecord, 'log'>;
35
- export interface DaemonStatus {
36
- startedAt: string;
37
- intervalSeconds: number;
38
- /** `sha` for a git checkout, `version` for an npm install. */
39
- reconciler: {
40
- sha?: string;
41
- version?: string;
42
- behind?: string;
43
- };
44
- reconciling: boolean;
45
- /** When the next interval run is due, if the daemon is sleeping. */
46
- nextRunAt?: string;
47
- configRepo?: string;
48
- }
49
- export interface UiOptions {
50
- socketPath: string;
51
- status: () => DaemonStatus;
52
- runs: {
53
- list: (limit: number) => RunSummary[];
54
- get: (id: string) => RunRecord | undefined;
55
- };
56
- plans: PlanService;
57
- log: (scope: string, message: string) => void;
58
- }
59
- export declare function startUi(opts: UiOptions): Server;
60
- export declare function handle(opts: UiOptions, req: IncomingMessage, res: ServerResponse): Promise<void>;
61
- export declare function esc(s: unknown): string;
62
- //# sourceMappingURL=ui.d.ts.map
package/dist/ui.d.ts.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"ui.d.ts","sourceRoot":"","sources":["../src/ui.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgB,KAAK,eAAe,EAAE,KAAK,MAAM,EAAE,KAAK,cAAc,EAAE,MAAM,WAAW,CAAA;AAEhG,OAAO,EAA+C,KAAK,WAAW,EAAoB,MAAM,YAAY,CAAA;AAE5G;;;;;;;;;;;;;;;GAeG;AAEH,qDAAqD;AACrD,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAA;IACV,qEAAqE;IACrE,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,CAAA;IACjE,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,yCAAyC;IACzC,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,uEAAuE;IACvE,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,GAAG,EAAE,MAAM,EAAE,CAAA;CACd;AAED,MAAM,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;AAE/C,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,MAAM,CAAA;IACjB,eAAe,EAAE,MAAM,CAAA;IACvB,8DAA8D;IAC9D,UAAU,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IAC/D,WAAW,EAAE,OAAO,CAAA;IACpB,oEAAoE;IACpE,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,WAAW,SAAS;IACxB,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,MAAM,YAAY,CAAA;IAC1B,IAAI,EAAE;QACJ,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,UAAU,EAAE,CAAA;QACrC,GAAG,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,SAAS,GAAG,SAAS,CAAA;KAC3C,CAAA;IACD,KAAK,EAAE,WAAW,CAAA;IAClB,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CAC9C;AAMD,wBAAgB,OAAO,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,CA4B/C;AAID,wBAAsB,MAAM,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,eAAe,EAAE,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAqEtG;AA2ED,wBAAgB,GAAG,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,CAKtC"}
package/dist/ui.js DELETED
@@ -1,288 +0,0 @@
1
- import { chmodSync, existsSync, unlinkSync } from 'node:fs';
2
- import { hostname } from 'node:os';
3
- import { createServer } from 'node:http';
4
- import { isRecordId } from './records.js';
5
- import { PlanError } from './plans.js';
6
- const MAX_BODY = 16 * 1024;
7
- /** Longest a `?wait=` may hold a request open, in seconds. */
8
- const MAX_WAIT_S = 600;
9
- export function startUi(opts) {
10
- const { socketPath, log } = opts;
11
- if (existsSync(socketPath)) {
12
- try {
13
- unlinkSync(socketPath);
14
- }
15
- catch {
16
- /* listen() will say why */
17
- }
18
- }
19
- const server = createServer((req, res) => {
20
- handle(opts, req, res).catch((err) => {
21
- log('ui', `error on ${req.method} ${req.url}: ${err instanceof Error ? err.message : String(err)}`);
22
- if (!res.headersSent)
23
- sendJson(res, 500, { error: 'internal error' });
24
- else
25
- res.end();
26
- });
27
- });
28
- server.listen(socketPath, () => {
29
- // A reverse proxy's workers (often in a container) run as their own uid.
30
- // The socket is only reachable from this host and whatever mounts it; who
31
- // can reach the proxy route is the real gate.
32
- chmodSync(socketPath, 0o666);
33
- log('ui', `listening on ${socketPath}`);
34
- });
35
- server.on('error', (err) => log('ui', `listener error: ${err.message}`));
36
- return server;
37
- }
38
- // ----------------------------------------------------------------- routes ---
39
- export async function handle(opts, req, res) {
40
- const url = new URL(req.url ?? '/', 'http://concord.local');
41
- const path = url.pathname.replace(/\/+$/, '') || '/';
42
- const method = req.method ?? 'GET';
43
- const parts = path.split('/').filter(Boolean);
44
- if (method === 'GET' && path === '/healthz')
45
- return sendText(res, 200, 'ok');
46
- // --------------------------------------------------------------- API ---
47
- if (parts[0] === 'api') {
48
- if (method === 'GET' && path === '/api/status')
49
- return sendJson(res, 200, opts.status());
50
- if (method === 'GET' && path === '/api/runs') {
51
- return sendJson(res, 200, { runs: opts.runs.list(limitParam(url)) });
52
- }
53
- if (method === 'GET' && parts[1] === 'runs' && parts.length === 3) {
54
- const run = isRecordId(parts[2]) ? opts.runs.get(parts[2]) : undefined;
55
- return run ? sendJson(res, 200, run) : sendJson(res, 404, { error: 'no such run' });
56
- }
57
- if (method === 'GET' && path === '/api/plans') {
58
- return sendJson(res, 200, { plans: opts.plans.list(limitParam(url)) });
59
- }
60
- if (method === 'POST' && path === '/api/plans') {
61
- const body = await readJson(req);
62
- if (body === undefined)
63
- return sendJson(res, 400, { error: 'body must be JSON: {"branch": "…", "sha"?: "…"}' });
64
- try {
65
- const plan = opts.plans.request(body.branch, body.sha);
66
- const waitS = waitParam(url);
67
- const done = waitS > 0 ? await opts.plans.wait(plan.id, waitS * 1000) : plan;
68
- return sendJson(res, 202, withLinks(done ?? plan));
69
- }
70
- catch (err) {
71
- if (err instanceof PlanError)
72
- return sendJson(res, err.status, { error: err.message });
73
- throw err;
74
- }
75
- }
76
- if (method === 'GET' && parts[1] === 'plans' && parts.length === 3) {
77
- const id = parts[2];
78
- if (!isRecordId(id))
79
- return sendJson(res, 404, { error: 'no such plan' });
80
- const plan = await opts.plans.wait(id, waitParam(url) * 1000);
81
- return plan ? sendJson(res, 200, withLinks(plan)) : sendJson(res, 404, { error: 'no such plan' });
82
- }
83
- return sendJson(res, 404, { error: 'not found' });
84
- }
85
- // ---------------------------------------------------------------- HTML ---
86
- if (method === 'GET' && path === '/')
87
- return sendHtml(res, 200, pageHome(opts));
88
- if (method === 'POST' && path === '/plans') {
89
- const form = await readForm(req);
90
- try {
91
- const plan = opts.plans.request(form.get('branch')?.trim(), form.get('sha')?.trim() || undefined);
92
- res.writeHead(303, { location: `/plans/${plan.id}` });
93
- return void res.end();
94
- }
95
- catch (err) {
96
- if (err instanceof PlanError)
97
- return sendHtml(res, err.status, pageError(err.message));
98
- throw err;
99
- }
100
- }
101
- if (method === 'GET' && parts[0] === 'plans' && parts.length === 2) {
102
- const plan = isRecordId(parts[1]) ? opts.plans.get(parts[1]) : undefined;
103
- return plan ? sendHtml(res, 200, pagePlan(plan)) : sendHtml(res, 404, pageError('No such plan.'));
104
- }
105
- if (method === 'GET' && parts[0] === 'runs' && parts.length === 2) {
106
- const run = isRecordId(parts[1]) ? opts.runs.get(parts[1]) : undefined;
107
- return run ? sendHtml(res, 200, pageRun(run)) : sendHtml(res, 404, pageError('No such run.'));
108
- }
109
- return sendHtml(res, 404, pageError('Not found.'));
110
- }
111
- function withLinks(plan) {
112
- return { ...plan, url: `/plans/${plan.id}` };
113
- }
114
- function limitParam(url) {
115
- const n = Number(url.searchParams.get('limit') ?? 20);
116
- return Number.isInteger(n) && n > 0 ? Math.min(n, 100) : 20;
117
- }
118
- function waitParam(url) {
119
- const n = Number(url.searchParams.get('wait') ?? 0);
120
- return Number.isFinite(n) && n > 0 ? Math.min(n, MAX_WAIT_S) : 0;
121
- }
122
- // --------------------------------------------------------------- plumbing ---
123
- function readBody(req) {
124
- return new Promise((resolve) => {
125
- const chunks = [];
126
- let size = 0;
127
- req.on('data', (c) => {
128
- size += c.length;
129
- if (size > MAX_BODY) {
130
- resolve(undefined);
131
- req.destroy();
132
- return;
133
- }
134
- chunks.push(c);
135
- });
136
- req.on('end', () => resolve(Buffer.concat(chunks).toString('utf8')));
137
- req.on('error', () => resolve(undefined));
138
- });
139
- }
140
- async function readJson(req) {
141
- const body = await readBody(req);
142
- if (body === undefined)
143
- return undefined;
144
- try {
145
- const parsed = JSON.parse(body);
146
- return parsed && typeof parsed === 'object' && !Array.isArray(parsed)
147
- ? parsed
148
- : undefined;
149
- }
150
- catch {
151
- return undefined;
152
- }
153
- }
154
- async function readForm(req) {
155
- return new URLSearchParams((await readBody(req)) ?? '');
156
- }
157
- function sendJson(res, code, body) {
158
- res.writeHead(code, { 'content-type': 'application/json; charset=utf-8', 'cache-control': 'no-store' });
159
- res.end(JSON.stringify(body, null, 2) + '\n');
160
- }
161
- function sendText(res, code, body) {
162
- res.writeHead(code, { 'content-type': 'text/plain; charset=utf-8' });
163
- res.end(body + '\n');
164
- }
165
- function sendHtml(res, code, body) {
166
- res.writeHead(code, {
167
- 'content-type': 'text/html; charset=utf-8',
168
- 'cache-control': 'no-store',
169
- // Nothing on these pages is meant to run script, load from elsewhere, or be framed.
170
- 'content-security-policy': "default-src 'none'; style-src 'unsafe-inline'; form-action 'self'; frame-ancestors 'none'",
171
- });
172
- res.end(body);
173
- }
174
- // ------------------------------------------------------------------ pages ---
175
- export function esc(s) {
176
- return String(s ?? '').replace(/[&<>"']/g, (c) => ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' })[c]);
177
- }
178
- const CSS = `
179
- :root { color-scheme: light dark; --muted: #888; --ok: #2e9e5b; --warn: #c98a00; --bad: #d0453a; --run: #3a7bd5; }
180
- body { font: 14px/1.45 system-ui, sans-serif; max-width: 1100px; margin: 24px auto; padding: 0 16px; }
181
- h1 { font-size: 20px; margin: 0 0 4px } h2 { font-size: 16px; margin: 28px 0 8px }
182
- a { color: inherit } .muted { color: var(--muted) } code, pre { font: 12px/1.4 ui-monospace, monospace }
183
- table { border-collapse: collapse; width: 100% } td, th { text-align: left; padding: 4px 10px 4px 0; vertical-align: top; border-bottom: 1px solid #8883 }
184
- pre { background: #8881; padding: 10px; overflow-x: auto; white-space: pre-wrap; word-break: break-all }
185
- .pill { display: inline-block; padding: 0 8px; border-radius: 9px; font-size: 12px; color: #fff }
186
- .s-converged, .s-planned { background: var(--ok) } .s-changed { background: var(--run) }
187
- .s-running, .s-queued { background: var(--run) } .s-aborted, .s-error, .s-failed { background: var(--bad) }
188
- .s-refused { background: var(--warn) }
189
- .box { border: 1px solid #8884; border-radius: 6px; padding: 10px 14px; margin: 10px 0 }
190
- .err { border-color: var(--bad) } .warn { border-color: var(--warn) }
191
- form input[type=text] { font: inherit; padding: 4px 6px; width: 320px } form button { font: inherit; padding: 4px 12px }
192
- ul.ops { margin: 4px 0; padding-left: 18px } .k-delete { color: var(--bad) } .k-create { color: var(--ok) }
193
- `;
194
- function layout(title, body, refresh = false) {
195
- return `<!doctype html><html><head><meta charset="utf-8"><title>${esc(title)} · concord</title>
196
- ${refresh ? '<meta http-equiv="refresh" content="3">' : ''}
197
- <meta name="viewport" content="width=device-width, initial-scale=1"><style>${CSS}</style></head>
198
- <body><p class="muted"><a href="/">concord</a> · ${esc(hostname())}</p>${body}</body></html>`;
199
- }
200
- const pill = (status) => `<span class="pill s-${esc(status)}">${esc(status)}</span>`;
201
- const time = (iso) => (iso ? `<span title="${esc(iso)}">${esc(iso.replace('T', ' ').slice(0, 19))}Z</span>` : '');
202
- const short = (sha) => (sha ? `<code>${esc(sha.slice(0, 10))}</code>` : '');
203
- function duration(from, to) {
204
- if (!from || !to)
205
- return '';
206
- const s = Math.round((Date.parse(to) - Date.parse(from)) / 1000);
207
- return s >= 60 ? `${Math.floor(s / 60)}m${s % 60}s` : `${s}s`;
208
- }
209
- function pageHome(opts) {
210
- const st = opts.status();
211
- const runs = opts.runs.list(20);
212
- const plans = opts.plans.list(20);
213
- const busy = st.reconciling || plans.some((p) => p.status === 'queued' || p.status === 'running');
214
- const statusBox = `<div class="box${st.reconciler.behind ? ' warn' : ''}">
215
- <b>${st.reconciling ? 'Reconciling now' : 'Idle'}</b>${st.nextRunAt && !st.reconciling ? ` <span class="muted">· next interval run ${time(st.nextRunAt)}</span>` : ''}<br>
216
- <span class="muted">reconciler</span> ${st.reconciler.version ? `<code>${esc(st.reconciler.version)}</code>` : short(st.reconciler.sha)}${st.reconciler.behind ? ` <b>⚠ ${esc(st.reconciler.behind)}</b> — update the reconciler on this host` : ''}
217
- · <span class="muted">every</span> ${esc(st.intervalSeconds)}s · <span class="muted">up since</span> ${time(st.startedAt)}</div>`;
218
- const planForm = `<form method="post" action="/plans" class="box">
219
- <b>Plan a branch</b> of the config repo against the live fleet (read-only).<br>
220
- <input type="text" name="branch" placeholder="my-change" required pattern="[A-Za-z0-9._/-]+">
221
- <input type="text" name="sha" placeholder="expected sha (optional)" style="width:200px">
222
- <button>Plan</button>
223
- <div class="muted">The branch must contain the current main — a branch behind main is refused.</div></form>`;
224
- return layout('concord', `<h1>Concord</h1>${statusBox}
225
- <h2>Plans</h2>${planForm}${plansTable(plans)}
226
- <h2>Reconciles</h2>${runsTable(runs)}`, busy);
227
- }
228
- function plansTable(plans) {
229
- if (!plans.length)
230
- return '<p class="muted">No plans yet.</p>';
231
- return `<table><tr><th>requested</th><th>branch</th><th>commit</th><th>status</th><th>changes</th><th></th></tr>${plans
232
- .map((p) => `<tr><td>${time(p.requestedAt)}</td><td><code>${esc(p.branch)}</code></td><td>${short(p.sha)}</td>
233
- <td>${pill(p.status)}</td><td>${p.totalOps ?? ''}</td>
234
- <td><a href="/plans/${esc(p.id)}">view</a>${p.error ? ` <span class="muted">${esc(truncate(p.error, 90))}</span>` : ''}</td></tr>`)
235
- .join('')}</table>`;
236
- }
237
- function runsTable(runs) {
238
- if (!runs.length)
239
- return '<p class="muted">No reconciles recorded since this version was deployed.</p>';
240
- return `<table><tr><th>started</th><th>trigger</th><th>config</th><th>status</th><th>took</th><th>summary</th></tr>${runs
241
- .map((r) => `<tr><td><a href="/runs/${esc(r.id)}">${time(r.startedAt)}</a></td><td>${esc(r.trigger)}</td>
242
- <td>${short(r.sha)}</td><td>${pill(r.status)}</td><td>${duration(r.startedAt, r.finishedAt)}</td>
243
- <td class="muted">${esc(truncate(r.summary ?? '', 110))}</td></tr>`)
244
- .join('')}</table>`;
245
- }
246
- function pagePlan(p) {
247
- const live = p.status === 'queued' || p.status === 'running';
248
- const r = p.result;
249
- const changed = r?.modules.filter((m) => m.ops.length || m.error) ?? [];
250
- const head = `<h1>Plan of <code>${esc(p.branch)}</code> ${pill(p.status)}</h1>
251
- <p class="muted">${esc(p.id)} · requested ${time(p.requestedAt)}${p.finishedAt ? ` · took ${duration(p.startedAt, p.finishedAt)}` : ''}
252
- ${p.sha ? ` · commit ${short(p.sha)}` : ''}${p.mainSha ? ` · main ${short(p.mainSha)}` : ''}</p>
253
- ${p.error ? `<div class="box ${p.status === 'refused' ? 'warn' : 'err'}">${esc(p.error)}</div>` : ''}
254
- ${p.overlappedRun ? '<div class="box warn">A real reconcile ran during this plan, so some state it read may have been mid-change. Plan again if anything looks odd.</div>' : ''}`;
255
- const ahead = p.ahead?.length
256
- ? `<h2>On the branch, not on main (${p.ahead.length})</h2><ul>${p.ahead
257
- .map((c) => `<li>${short(c.sha)} ${esc(c.subject)}</li>`)
258
- .join('')}</ul>`
259
- : p.ahead
260
- ? '<h2>On the branch, not on main</h2><p class="muted">Nothing — this is main.</p>'
261
- : '';
262
- const changes = r
263
- ? `<h2>${r.totalOps} change(s)${r.failed ? ' before the plan aborted' : ''}</h2>
264
- ${changed.length ? changed.map(moduleBlock).join('') : '<p>Nothing would change.</p>'}
265
- ${r.unreachable.length ? `<div class="box warn">Not checked (host unreachable): ${esc(r.unreachable.join(', '))}</div>` : ''}
266
- ${r.skipped.length ? `<div class="box err">Not evaluated (after the abort): ${esc(r.skipped.join(', '))}</div>` : ''}
267
- ${r.warnings.map((w) => `<div class="box warn">${esc(w.scope)}: ${esc(w.message)}</div>`).join('')}`
268
- : '';
269
- return layout(`plan ${p.branch}`, `${head}${changes}${ahead}<h2>Log</h2><pre>${esc(p.log.join('\n'))}</pre>`, live);
270
- }
271
- function moduleBlock(m) {
272
- return `<div class="box${m.error ? ' err' : ''}"><b><code>${esc(m.scope)}</code></b>${m.error ? `<br>ERROR: ${esc(m.error)}` : ''}<ul class="ops">${m.ops
273
- .map((o) => `<li><span class="k-${esc(o.kind)}">[${esc(o.kind)}]</span> ${esc(o.summary)}</li>`)
274
- .join('')}</ul></div>`;
275
- }
276
- function pageRun(r) {
277
- return layout(`run ${r.id}`, `<h1>Reconcile ${pill(r.status)}</h1>
278
- <p class="muted">${esc(r.id)} · ${esc(r.trigger)} · started ${time(r.startedAt)}${r.finishedAt ? ` · took ${duration(r.startedAt, r.finishedAt)}` : ''}${r.sha ? ` · config ${short(r.sha)}` : ''}</p>
279
- ${r.summary ? `<div class="box${r.status === 'aborted' || r.status === 'error' ? ' err' : ''}">${esc(r.summary)}</div>` : ''}
280
- <h2>Log</h2><pre>${esc(r.log.join('\n'))}</pre>`, r.status === 'running');
281
- }
282
- function pageError(message) {
283
- return layout('error', `<div class="box err">${esc(message)}</div><p><a href="/">back</a></p>`);
284
- }
285
- function truncate(s, n) {
286
- return s.length > n ? `${s.slice(0, n - 1)}…` : s;
287
- }
288
- //# sourceMappingURL=ui.js.map
package/dist/ui.js.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"ui.js","sourceRoot":"","sources":["../src/ui.ts"],"names":[],"mappings":"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"}