clavarium 0.2.382-next.1 → 0.2.384-next.1

package/deploy/online.mjs

@@ -59,6 +59,7 @@ 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',
@@ -253,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). */
@@ -789,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.382-next.1",
+  "version": "0.2.384-next.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "clavarium",
-      "version": "0.2.382-next.1",
+      "version": "0.2.384-next.1",
       "license": "MIT",
       "dependencies": {
         "@xterm/addon-fit": "^0.11.0",

package/package.json

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

package/server/gitkeeper.mjs

@@ -190,7 +190,8 @@ export function withoutOldSetting(record) {
 /* WHAT TO DO about a refused automatic sending, said after it in the chat;
    by the reason #once is given (its first word when not listed whole). */
 const TODO = Object.freeze({
-    cap: 'Raise the cap of this conversation, or send it from the review.',
+    /* 07-11: where it is set, said (the owner asked « on configure ça où ? »). */
+    cap: 'Raise the cap in this conversation: Assets, the repository, Automatic sending, « Sendings an hour ». Or send it from the review.',
     create: 'Make the branch on the remote, send it from the review, or let this conversation create branches.',
     'checks-failed': 'The agent was told; see the checks in the review.',
     'checks-none': 'Set a check command or a pre-push hook, or stop asking for checks for this conversation.',

package/server/settingswords.mjs

@@ -26,6 +26,18 @@ export const SETTINGS_WORDS_FR = {
     'set-update-out': '{v} est sortie', 'set-up-to-date': 'À jour · {v}', 'set-wifi-on': 'Wi-Fi · {name}', 'set-wifi-off': 'Wi-Fi non utilisé', 'set-cable': 'Câble',
     /* A room message an AI could not get (its chat off): rooms.mjs say, missed. */
     'set-room-missed': '{names} ne l\'a pas reçu : discussion coupée',
+    /* A repository's automatic sending (gitkeeper.mjs), in a conversation's Assets. */
+    'set-auto-title': 'Envoi automatique',
+    'set-auto-branches': 'Branches envoyées seules (vide : jamais)',
+    'set-auto-quiet': 'Délai de calme, en secondes',
+    'set-auto-hour': 'Envois par heure, au plus (0 : sans limite)',
+    'set-auto-create': 'Peut créer une branche absente du distant',
+    'set-auto-checks': 'Seulement après les vérifications',
+    'set-auto-off': 'désactivé',
+    'set-auto-on': 'activé : {list}',
+    'set-auto-saved': 'Enregistré.',
+    'set-auto-save': 'Enregistrer',
+    'set-auto-confirm': 'Confirmer et enregistrer',
     /* A box's learning session (boxcollect.mjs): the radio, its false wakes kept. */
     'set-collect': 'Séance d\'apprentissage (radio)', 'set-collect-from': 'de', 'set-collect-to': 'à',
     'set-collect-go': 'Programmer', 'set-collect-stop': 'Arrêter', 'set-collect-scheduled': 'Programmée de {from} à {to}',

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

@@ -2328,7 +2328,7 @@
         const box = document.createElement('details'); box.className = 'auto-send'; box.dataset.repository = name;
         box.open = autoOpen.has(`${conversation}/${name}`);
         box.addEventListener('toggle', () => { if (box.open) autoOpen.add(`${conversation}/${name}`); else autoOpen.delete(`${conversation}/${name}`); });
-        const summary = document.createElement('summary'); summary.textContent = 'Automatic sending';
+        const summary = document.createElement('summary'); summary.textContent = uiSaid('set-auto-title', 'Automatic sending');
         const state = document.createElement('small'); state.className = 'hint auto-state'; summary.append(' ', state);
         const form = document.createElement('form'); form.autocomplete = 'off';
         const field = (text, input) => { const label = document.createElement('label'); label.textContent = text; label.append(input); return label; };
@@ -2345,23 +2345,23 @@
         const unknown = document.createElement('p'); unknown.className = 'hint auto-unknown'; unknown.hidden = true;
         unknown.textContent = 'The remote\'s default branch is not known yet (it is learnt at a refresh): until it is, nothing is sent by itself unless you confirm each branch or pattern of the list.';
         const shared = document.createElement('p'); shared.className = 'hint auto-shared'; shared.hidden = true;
-        const sure = document.createElement('button'); sure.type = 'button'; sure.className = 'danger auto-sure'; sure.textContent = 'Confirm and save'; sure.hidden = true;
-        const save = document.createElement('button'); save.type = 'submit'; save.className = 'primary'; save.textContent = 'Save';
+        const sure = document.createElement('button'); sure.type = 'button'; sure.className = 'danger auto-sure'; sure.textContent = uiSaid('set-auto-confirm', 'Confirm and save'); sure.hidden = true;
+        const save = document.createElement('button'); save.type = 'submit'; save.className = 'primary'; save.textContent = uiSaid('set-auto-save', 'Save');
         const said = document.createElement('span'); said.className = 'hint auto-said'; said.setAttribute('role', 'status');
         const actions = document.createElement('div'); actions.className = 'row'; actions.append(save, sure, said);
         /* Closed until the settings there are have arrived: a list typed
            before would be overwritten by them. */
         const fields = document.createElement('fieldset'); fields.disabled = true;
         form.append(fields);
-        fields.append(field('Branches it may send to by itself (one per line or comma, "try/*" allowed). Empty: never.', branches), hint,
-            field('Quiet delay, in seconds', quiet), field('Sendings an hour, at most (0: no cap)', perHour),
-            check('It may create a branch the remote does not have', create), check('Only after the checks passed in its machine', checks), unknown, shared, asking, actions);
+        fields.append(field(uiSaid('set-auto-branches', 'Branches it may send to by itself (one per line or comma, "try/*" allowed). Empty: never.'), branches), hint,
+            field(uiSaid('set-auto-quiet', 'Quiet delay, in seconds'), quiet), field(uiSaid('set-auto-hour', 'Sendings an hour, at most (0: no cap)'), perHour),
+            check(uiSaid('set-auto-create', 'It may create a branch the remote does not have'), create), check(uiSaid('set-auto-checks', 'Only after the checks passed in its machine'), checks), unknown, shared, asking, actions);
         box.append(summary, form);
         const fill = (about) => {
             const s = about.settings;
             branches.value = s.branches.join('\n'); quiet.value = String(s.quietSeconds); perHour.value = String(s.perHour);
             create.checked = s.create; checks.checked = s.checks;
-            state.textContent = s.branches.length ? `on: ${s.branches.join(', ')}` : 'off';
+            state.textContent = s.branches.length ? uiSaid('set-auto-on', 'on: {list}', { list: s.branches.join(', ') }) : uiSaid('set-auto-off', 'off');
             unknown.hidden = Boolean(about.defaultBranch);
             const others = about.sharedWith ?? [];
             shared.hidden = others.length === 0;
@@ -2376,7 +2376,7 @@
             const body = { branches: branches.value, quietSeconds: quiet.value === '' ? '' : Number(quiet.value), perHour: perHour.value === '' ? '' : Number(perHour.value), create: create.checked, checks: checks.checked, ...flags };
             const r = await fetch(where, { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify(body) });
             const j = await r.json().catch(() => ({}));
-            if (r.ok) { for (const k of Object.keys(flags)) delete flags[k]; fill(j); said.textContent = 'Saved.'; return; }
+            if (r.ok) { for (const k of Object.keys(flags)) delete flags[k]; fill(j); said.textContent = uiSaid('set-auto-saved', 'Saved.'); return; }
             /* Nothing was saved: the owner reads what it would allow, then confirms or changes the list. */
             if (j.kind === 'confirm-wide' || j.kind === 'confirm-shared') { asking.textContent = j.error; asking.hidden = false; sure.hidden = false; sure.dataset.kind = j.kind; return; }
             said.textContent = j.error || 'The request failed.';
@@ -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];