clavarium 0.2.381-next.1 → 0.2.383-next.1

package/deploy/online.mjs

@@ -58,6 +58,8 @@ import { doctor, servedCert, DOCTOR_PATHS } from './doctor.mjs';
 export const PATHS = {
     access: '/var/lib/clavarium-relay-access',
     tunnel: '/var/lib/clavarium-tunnel',
+    tunnelUnit: TUNNEL_UNIT,
+    relayDone: '/var/lib/clavarium/update/relay-version',
     relayConf: '/etc/clavarium/relay.conf',
     updateConf: '/etc/clavarium/update.conf',
     unit: '/etc/systemd/system/clavarium.service',
@@ -207,6 +209,15 @@ export function readRelayConf(P = PATHS) {
     try { for (const line of readFileSync(P.relayConf, 'utf8').split('\n')) { const m = /^([A-Z_]+)=(.*)$/.exec(line.trim()); if (m) conf[m[1]] = m[2]; } } catch { return null; }
     return conf.HOST ? conf : null;
 }
+/* The relay of a machine put online before relay.conf existed (07-11, found on a test machine): only
+   its tunnel unit says it. Read there, as the updater does (tunnel.mjs, relayOfUnit); never written back. */
+export function relayOf(P = PATHS) {
+    const conf = readRelayConf(P);
+    if (conf) return conf;
+    let unit = null;
+    try { unit = relayOfUnit(readFileSync(P.tunnelUnit ?? TUNNEL_UNIT, 'utf8')); } catch { return null; }
+    return unit ? { HOST: unit.relay, PORT: unit.port } : null;
+}
 function writeRelayConf(P, conf) {
     mkdirSync(join(P.relayConf, '..'), { recursive: true });
     writeFileSync(`${P.relayConf}.new`, `# The relay of this Clavarium. Written by clavarium online.\n${Object.entries(conf).map(([k, v]) => `${k}=${v}`).join('\n')}\n`, { mode: 0o644 });
@@ -243,6 +254,11 @@ export async function keepRelayCurrent(sys, P = PATHS, { done, unit = TUNNEL_UNI
     let last = '';
     try { last = readFileSync(done, 'utf8').trim(); } catch { /* never brought */ }
     if (last === version) return { state: 'current', version };
+    /* A new GENERATION of the relay program (0.1 -> 0.2: one relay for several homes, 07-11) is never brought
+       by the updater: the owner brings it once, `sudo clavarium relay update-relay`, when they want it.
+       Fixes within a generation still come by themselves. */
+    const gen = (v) => String(v).split('.').slice(0, 2).join('.');
+    if (gen(version) !== gen(last || '0.1.0')) return { state: 'held', version, why: `the relay program ${version} is a new generation: bring it with sudo clavarium relay update-relay` };
     const r = await keeper(sys, P, conf, ['update-relay', version]);
     if (r.code !== 0) {
         /* sys.run says { code, out, err } (realSys). */
@@ -662,7 +678,7 @@ function writeInvites(P, v) {
 }
 /* Only the principal adds homes: the machine that holds the relay's maintenance key, online. */
 function principal(P) {
-    const conf = readRelayConf(P);
+    const conf = relayOf(P);
     if (!conf) throw new Refused('this machine has no relay (sudo clavarium online --relay HOST --domain NAME)');
     if (conf.ROLE === 'home') throw new Refused(`this machine is a home of the relay ${conf.HOST}: only its principal${conf.PRINCIPAL ? ` (${conf.PRINCIPAL})` : ''} adds or removes homes`);
     const domain = serverModeOf(P);
@@ -729,7 +745,7 @@ export async function joinWithCode(sys, P, given, key) {
 
 /* `sudo clavarium relay VERB` */
 export async function relayCommand(args, sys, P = PATHS) {
-    const conf = readRelayConf(P);
+    const conf = relayOf(P);
     if (!conf) throw new Refused('this machine has no relay (sudo clavarium online --relay HOST --domain NAME)');
     const [verb, ...rest] = args;
     if (conf.ROLE === 'home') throw new Refused(`this machine is a home of the relay ${conf.HOST}: the relay is kept by its principal${conf.PRINCIPAL ? `, ${conf.PRINCIPAL}` : ''}`);
@@ -779,6 +795,8 @@ export async function relayCommand(args, sys, P = PATHS) {
             if (!/^\d{1,4}\.\d{1,4}\.\d{1,6}(-[0-9A-Za-z.-]{1,40})?$/.test(version ?? '')) throw new Bad('relay update-relay [X.Y.Z]');
             const r = await keeper(sys, P, conf, ['update-relay', version], { stream: true });
             if (r.code !== 0) throw new Failed(`the relay did not update (exit ${r.code})`);
+            /* Said to the updater (keepRelayCurrent): this generation is the owner's choice now, its fixes come by themselves. */
+            try { const done = P.relayDone ?? '/var/lib/clavarium/update/relay-version'; writeFileSync(`${done}.new`, `${version}\n`); renameSync(`${done}.new`, done); } catch { /* the updater asks again: no harm */ }
             return;
         }
         default: throw new Bad('usage: sudo clavarium relay status | repair | update-os [--reboot] | update-relay [X.Y.Z] | forget-setup-key | homes | invite NAME | add-home NAME --key KEY | remove-home NAME');

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "clavarium",
-  "version": "0.2.381-next.1",
+  "version": "0.2.383-next.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "clavarium",
-      "version": "0.2.381-next.1",
+      "version": "0.2.383-next.1",
       "license": "MIT",
       "dependencies": {
         "@xterm/addon-fit": "^0.11.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clavarium",
-  "version": "0.2.381-next.1",
+  "version": "0.2.383-next.1",
   "license": "MIT",
   "type": "module",
   "description": "A conversation is a VM with a terminal in it. Everything else is a folder.",

package/server/updates.mjs

@@ -67,7 +67,7 @@ function timerLastRun() {
 }
 const firstLine = (text) => String(text ?? '').trim().split('\n').filter(Boolean).pop()?.replace(/^REFUSED: /, '').slice(0, 300) ?? '';
 
-const RELAY_STATES = ['none', 'no-key', 'current', 'brought', 'refused', 'failed'];
+const RELAY_STATES = ['none', 'no-key', 'current', 'brought', 'refused', 'failed', 'held'];
 
 export class Updates {
     #host; #state; #conf; #version; #store; #alerts; #timer; #lastLook; #lastLookCache = { at: 0, value: null }; #clock; #noticeCache = { at: -Infinity, value: '' };

package/web/app.js

@@ -7306,6 +7306,8 @@
             refused: () => ['Relay not kept up to date: it refuses this server\'s key', 'Once: sudo clavarium key on this server, then relay.sh again on the relay, with --key and --keeper-key.', true],
             'no-key': () => ['Relay not kept up to date: no maintenance key', 'sudo clavarium online --relay HOST sets one up.', true],
             failed: (r) => [`Relay update failed: ${r.why ?? 'unknown'} · tried again later`, '', true],
+            /* 07-11: a new generation of the relay (several homes) waits for the owner, never brought by itself. */
+            held: (r) => [`Relay ${r.version} ready, not installed`, 'When you want it: sudo clavarium relay update-relay', false],
         };
         const relayBox = $('updates-relay');
         relayBox.hidden = !relay || !RELAY_SAID[relay.state];