clavarium 0.1.0-next.4 → 0.1.0-next.5

package/deploy/install.sh

@@ -661,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.4",
+  "version": "0.1.0-next.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "clavarium",
-      "version": "0.1.0-next.4",
+      "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.4",
+  "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.",

package/server/main.mjs

@@ -397,8 +397,6 @@ function hostSetting(key) {
 }
 
 if (process.argv[1] === fileURLToPath(import.meta.url)) {
-    /* DELIBERATELY BROKEN, this version only: it proves an update that does not start is undone by itself. */
-    console.error('0.1.0-next.4 refuses to start, on purpose: the updater must go back by itself.'); process.exit(70);
     const argv = process.argv.slice(2);
     const port = Number(option(argv, 'port', '7717'));
     const host = option(argv, 'host', '');