clavarium 0.1.0-next.3 → 0.1.0-next.5

package/deploy/install.sh

@@ -601,6 +601,15 @@ if [ -n "$RELAY" ]; then
     apt-get install -y -qq openssh-client >/dev/null
     account clavarium-tunnel /nonexistent
     install -d -o clavarium-tunnel -g clavarium-tunnel -m 0700 /var/lib/clavarium-tunnel
+    # An installation made before this script named the key "cle" and gave it
+    # to another account: the relay knows THAT key. It is taken over, never
+    # replaced, and what the tunnel reads is given to the account that runs it.
+    if [ ! -e /var/lib/clavarium-tunnel/key ] && [ -s /var/lib/clavarium-tunnel/cle ]; then
+        install -o clavarium-tunnel -g clavarium-tunnel -m 0600 /var/lib/clavarium-tunnel/cle /var/lib/clavarium-tunnel/key
+        [ -s /var/lib/clavarium-tunnel/cle.pub ] && install -o clavarium-tunnel -g clavarium-tunnel -m 0644 /var/lib/clavarium-tunnel/cle.pub /var/lib/clavarium-tunnel/key.pub
+        echo "   the tunnel key of the earlier installation is kept: the relay already knows it"
+    fi
+    [ -e /var/lib/clavarium-tunnel/known_hosts ] && chown clavarium-tunnel:clavarium-tunnel /var/lib/clavarium-tunnel/known_hosts
     # The private key is made here and never leaves this machine.
     [ -e /var/lib/clavarium-tunnel/key ] || sudo -u clavarium-tunnel ssh-keygen -q -t ed25519 -N '' -C clavarium-tunnel -f /var/lib/clavarium-tunnel/key
     # The relay's identity is taken once and then held: a different machine
@@ -652,6 +661,12 @@ if [ -n "$RELAY" ]; then
     echo
     echo "ON THE RELAY ($RELAY), run this one command; the tunnel then comes up by itself:"
     echo "    sudo deploy/relay.sh --key \"$TUNNEL_KEY\""
+    # A server with a screen and a keyboard only: the key, carried by a phone.
+    # It is a PUBLIC key: showing it is safe; it lets the relay know this machine.
+    if command -v qrencode >/dev/null 2>&1 || apt-get install -y -qq qrencode >/dev/null 2>&1; then
+        echo "The same key, to read with a phone or a tablet:"
+        qrencode -t ANSIUTF8 -m 2 -- "$TUNNEL_KEY" || true
+    fi
     echo "It will print this, and it must be the same:    $RELAY_PRINT"
     echo "The name $DOMAIN must lead to the relay."
 else

package/deploy/updater.mjs

@@ -480,7 +480,9 @@ export class Updater {
         if ((state.history ?? []).some((h) => h.to === available && h.action === 'update' && h.result !== 'done')) return `${available} failed here before: not tried again by itself`;
         if (this.busy()) return this.busy();
         await this.apply(available);
-        return `updated to ${available}`;
+        /* What the history says, not what was hoped: a version that did not start was undone. */
+        const last = (this.#state().history ?? []).at(-1);
+        return last?.to === available && last.result !== 'done' ? `${available} did not work: back to ${last.from ?? 'nothing'} (${last.why ?? last.result})` : `updated to ${available}`;
     }
 
     /* What the host program asked (a request file), or the timer's turn. */

package/npm-shrinkwrap.json

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

package/package.json

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