@vibelord/lanes 1.0.4 → 1.1.0

package/payload/lanes/install/enable-phone.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
-# Key-authenticated client entry point and local server setup. Tokens stay in the caller's terminal.
+# Key-authenticated client entry point for a phone or browser view; on the server a thin wrapper over
+# `lanes web <device> <layout> --token`, which prepares the view, enables the loopback web services, makes Tailscale
+# Serve forward https:8443 to them and shows a login token. Tokens stay in the caller's terminal.
 set -eu
 repo=$(cd "$(dirname "$0")/.." && pwd)
 host= device= local=0 named=0 layout=
@@ -12,7 +14,8 @@ while [ "$#" -gt 0 ]; do
             layout=$1 ;;
         -h|--help)
             echo 'usage: enable-phone.sh [--host SSH_ALIAS | --local] [--desktop|--mobile] [device]'
-            echo 'Client: --host lanes uses the SSH key from ./install.sh. Server: --local.'
+            echo 'Client: --host lanes uses the SSH key from ./install.sh. Server: --local runs'
+            echo '`lanes web <device> <layout> --token` (view, web services, Tailscale Serve, login token).'
             echo 'Mobile (phone lane pickers, device phone) is the default; --desktop serves the desktop sidebar layout'
             echo '(device browser) for a laptop or tablet browser. A running view of the other layout is refused.'
             exit 0 ;;
@@ -32,21 +35,6 @@ if [ -n "$host" ]; then
     exec ssh -t -o BatchMode=yes -o PreferredAuthentications=publickey -o ForwardAgent=no "$host" \
         "exec sh \"\$HOME/.local/share/lanes/current/install/enable-phone.sh\" --local '$device'$suffix"
 fi
-command -v tailscale >/dev/null 2>&1 || { echo 'Install and connect Tailscale on the server first.' >&2; exit 1; }
-sh "$repo/install/enable-web.sh" "$device" "$layout"
-if ! tailscale serve --bg --https=8443 http://127.0.0.1:8083; then
-    echo 'The server admin must allow this account to manage Tailscale Serve:' >&2
-    printf '  sudo tailscale set --operator=%s\n' "$(id -un)" >&2
-    echo 'Then run this command again. See docs/INSTALL.md for HTTPS setup.' >&2
-    exit 1
-fi
-dns=$(tailscale status --json | python3 -c 'import json,sys; print(json.load(sys.stdin)["Self"]["DNSName"].rstrip("."))')
-[ -n "$dns" ] || { echo 'This node needs Tailscale MagicDNS and HTTPS enabled.' >&2; exit 1; }
-if [ -n "$suffix" ]; then where='In a browser on your laptop or tablet'; else where='On your phone'; fi
-printf '\n%s, connect Tailscale and open:\n\n  https://%s:8443/%s\n\n' "$where" "$dns" "$device"
-printf 'The last line is NAME: TOKEN. Paste only TOKEN into the sign-in screen.\n'
-[ -n "$suffix" ] || printf 'In Safari, Share > Add to Home Screen installs the app.\n'
-printf '\n'
-# Zellij 0.45.1 requires --create-token by itself; --token-name cannot accompany it.
-exec "${LANES_SHARE:-$HOME/.local/share/lanes}/bin/zellij-0.45.1" \
-    --config-dir "$repo/zellij" --config "$repo/zellij/config.kdl" web --create-token
+# Exit codes are lanes web's: 0, 1 (an error line), 64 (Tailscale Serve refused, or the running lanes-web reads
+# another token database: the operator step is printed).
+exec "$repo/bin/lanes" web "$device" "$layout" --token

package/payload/lanes/install/enable-web.sh

@@ -16,7 +16,7 @@ while [ "$#" -gt 0 ]; do
     esac
     shift
 done
-if [ "$layout" = --desktop ]; then device=${device:-browser} suffix=' --desktop'; else layout=--mobile device=${device:-phone} suffix=; fi
+if [ "$layout" = --desktop ]; then device=${device:-browser}; else layout=--mobile device=${device:-phone}; fi
 case "$device" in -*|*[!A-Za-z0-9_.-]*) echo 'invalid device name' >&2; exit 2 ;; esac
 command -v caddy >/dev/null 2>&1 || { echo 'Install Caddy first (see docs/INSTALL.md).' >&2; exit 1; }
 export XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR:-/run/user/$(id -u)}
@@ -26,4 +26,4 @@ systemctl --user daemon-reload
 systemctl --user enable --now lanes-web.service lanes-mobile.service
 systemctl --user is-active --quiet lanes-web.service lanes-mobile.service
 printf '\nWeb frontend: 127.0.0.1:8083; Zellij: 127.0.0.1:8082 (loopback only).\n'
-printf 'For private HTTPS and a login token, run in your terminal:\n  sh "%s/install/enable-phone.sh" --local %s%s\n' "$repo" "$device" "$suffix"
+printf 'For private HTTPS (Tailscale Serve) and a login token, run in your own terminal:\n  lanes web %s %s --token\n' "$device" "$layout"

package/payload/lanes/install/host-install.sh

@@ -77,6 +77,12 @@ if [ "$start" = 1 ]; then
     systemctl --user daemon-reload
     "$repo/bin/lanes" sync
     systemctl --user enable --now lanes-statusd.service lanes-sync.timer lanes-ensure.timer lanes-gc.timer
+    # The enrolment service (libexec/enrold.py) runs the code of THIS install: enable, then (re)start it.
+    systemctl --user enable lanes-enrold.service
+    systemctl --user restart lanes-enrold.service
+    # A running web frontend reads the Caddyfile of the tree it was started from; an npm update stages a new tree,
+    # so a reload would keep the old routes (/enrol/ included): restart it, only when it runs. Clients reconnect.
+    systemctl --user try-restart lanes-mobile.service
 fi
 printf '\nServer installed from %s\n' "$repo"
 echo 'Configure boards in ~/.config/lanes/workspaces/; see workspaces.example/README.md.'