clavarium 0.1.3 → 0.1.5

package/deploy/doctor.mjs

@@ -213,6 +213,7 @@ Description=Clavarium - the certificate, every 20 minutes
 
 [Timer]
 OnBootSec=10min
+OnActiveSec=2min
 OnUnitActiveSec=20min
 
 [Install]

package/deploy/install.sh

@@ -705,6 +705,16 @@ TUNNEL
     systemctl daemon-reload
     systemctl enable --quiet clavarium-tunnel.service
     systemctl restart clavarium-tunnel.service
+    # Caddy asked Let's Encrypt as it started, BEFORE the tunnel was up: it could not
+    # be reached, and fell back to a certificate of its own. Asked again once the
+    # tunnel holds (ExitOnForwardFailure: an ssh still running after 10 s has its forwards).
+    if [ "$RELAY_INSTALLED" = "yes" ]; then
+        sleep 10
+        if systemctl is-active --quiet clavarium-tunnel.service; then
+            rm -rf -- "/var/lib/caddy/caddy/certificates/local/$DOMAIN"
+            systemctl restart caddy.service
+        fi
+    fi
     TUNNEL_KEY="$(cat /var/lib/clavarium-tunnel/key.pub)"
     RELAY_PRINT="$(ssh-keygen -l -f /var/lib/clavarium-tunnel/known_hosts | cut -d' ' -f2 | head -1)"
 fi

package/deploy/updater.mjs

@@ -595,7 +595,11 @@ async function main(argv) {
     switch (verb) {
         case 'check': await u.check().catch(() => {}); return print(u.about());
         case 'status': return print(u.about());
-        case 'run': { const r = await u.runOnce(); console.log(typeof r === 'string' ? r : 'done'); return; }
+        case 'run': {
+            /* What this release sets up beside itself (the certificate timer), at its first turn: the
+               update that brought it ran the PREVIOUS release's code. Idempotent; never stops the turn. */
+            try { const [{ installWatch }, { realSys }] = await Promise.all([import('./doctor.mjs'), import('./online.mjs')]); if (await installWatch(realSys())) console.error('updater: the certificate timer set up'); } catch (error) { console.error(`updater: the certificate timer could not be set up: ${error.message}`); }
+            const r = await u.runOnce(); console.log(typeof r === 'string' ? r : 'done'); return; }
         case 'set': if (rest.length !== 2) throw new Refused('set <mode|channel|window|port> <value>'); return print(u.set(rest[0], rest[1]));
         case 'prepare': { const r = await u.prepare({ version: value('--version'), fromDir: value('--from-dir') }); console.log(r.id); return; }
         case 'switch': if (!VERSION.test(rest[0] ?? '') && !LOCAL.test(rest[0] ?? '')) throw new Refused('switch <release>'); u.switchTo(rest[0]); return;

package/npm-shrinkwrap.json

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

package/package.json

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

package/server/conversations.mjs

@@ -9,6 +9,7 @@
 import { isConversationName } from './names.mjs';
 import { attachCommand, SOCKET } from './tmux.mjs';
 import { WORK, VM_USER, SHARING_STEP } from './vm.mjs';
+import { resumeOrFresh } from './tools.mjs';
 
 export const SESSION = 'main';
 export const STOP_DELAY_MS = 60_000;
@@ -424,7 +425,7 @@ export class Conversations {
            first: added at EVERY start, a resume included (a tool does not
            keep it from its last session). */
         const rights = tool.rights ? (c.askFirst === true ? tool.rights.ask : tool.rights.full) : [];
-        return [...(resume ? tool.resume : tool.command), ...rights];
+        return resume ? resumeOrFresh([...tool.resume, ...rights], [...tool.command, ...rights]) : [...tool.command, ...rights];
     }
 
     /* Whether its tool asks before acting (true), or acts without asking in

package/server/tools.mjs

@@ -107,3 +107,16 @@ export function readTools(text) {
 export function loadTools(path = new URL('../config/tools.json', import.meta.url)) {
     return readTools(readFileSync(path, 'utf8'));
 }
+
+/* TAKING UP ITS LAST SESSION, OR A NEW ONE: a tool told to resume where it has
+   no session of its own (never spoken to, its session files gone) may just say
+   so and stop ("No conversation found"), leaving a dead terminal. If the resume
+   fails within RESUME_GRACE_S, the tool starts fresh, in the same terminal. A
+   tool that ran and is quit stays quit. One argument vector, for tmux. */
+export const RESUME_GRACE_S = 20;
+const shq = (a) => `'${String(a).replace(/'/g, `'\\''`)}'`;
+export function resumeOrFresh(resume, fresh) {
+    const script = `t=$(date +%s); ${resume.map(shq).join(' ')}; c=$?; `
+        + `if [ "$c" -ne 0 ] && [ $(( $(date +%s) - t )) -lt ${RESUME_GRACE_S} ]; then echo; echo 'No session to take up here: a new one starts.'; exec ${fresh.map(shq).join(' ')}; fi; exit "$c"`;
+    return ['sh', '-c', script];
+}