1014dd6e42
A peer is a named reference to another LibrePortal instance. Phase 2 only
implements kind=backup-channel (friendly label over a hostname that shows
up in a shared backup repo); direct-ssh-direct and direct-ssh-via-relay
(Connect's blind-relay) are reserved enum values for Phase 3.
DB schema (db_create_tables.sh):
CREATE TABLE peers (
id INTEGER PRIMARY KEY AUTOINCREMENT,
name TEXT UNIQUE NOT NULL,
kind TEXT NOT NULL DEFAULT 'backup-channel',
config_json TEXT NOT NULL DEFAULT '{}',
status TEXT DEFAULT 'unknown',
last_seen TEXT,
created_at TEXT DEFAULT CURRENT_TIMESTAMP
);
+ indexes on name and kind.
config_json is kind-specific so new transports don't need a schema
migration. For backup-channel it carries {"hostname":"","loc_idx":N}.
Bash module (scripts/peer/):
peer_helpers.sh _peerDb, peerSqlEscape, peerValidateName/Kind.
peer_add.sh peerAdd <name> <kind> [k=v ...] → INSERT, refresh
generator. Rejects unimplemented kinds early so users
don't create dead-end peer records.
peer_remove.sh peerRemove <name> → DELETE.
peer_list.sh peerList → JSON array; peerGet, peerNameForHostname
(reverse-lookup for the migrate-tab overlay).
peer_check.sh peerCheckReachable, peerCheckAll. For backup-channel
'reachable' = at least one snapshot from that hostname
visible in (preferred|any enabled) location. Updates
status + last_seen so UI dots render without re-probing.
CLI (scripts/cli/commands/peer/):
libreportal peer list
libreportal peer get <name>
libreportal peer add <name> backup-channel hostname=<host> [loc_idx=<n>]
libreportal peer remove <name>
libreportal peer check [name]
Auto-routed by cli_initialize.sh's category-discovery.
WebUI data generator (scripts/webui/data/generators/peers/webui_peers.sh):
Emits data/peers/generated/peers.json with the peerList output and a
generated_at envelope. Hooked into webuiLibrePortalUpdate alongside the
backup generators.
Frontend:
- New top-level /peers route in spa.js (PeersPage class, peers-content.html).
- 'Peers' nav item in the topbar between Backups and the right-side controls.
- Add-peer modal with friendly-name + kind + hostname + preferred-location
selector (populated from the existing backup-locations data).
- Per-peer card with status dot, last-checked time, Check + Remove buttons.
- Phase 3 kinds appear in the kind dropdown as disabled options so users
can see what's coming.
Source-array wiring:
- generate_arrays.sh auto-created files_peer.sh from the new peer/ dir.
- cli_files.sh + app_files.sh include ${peer_scripts[@]} alphabetically.
- files_webui.sh auto-picked-up the new peers/ generator subfolder.
The migrate-tab friendly-name overlay (use peer names in /backup/migrate
when a peer record exists for a hostname) is intentionally deferred — it's
a 5-line frontend lookup once peers.json is loaded; cleaner to add after
Phase 3 ships its peer-detail view.
Signed-off-by: librelad <librelad@digitalangels.vip>
46 lines
1.3 KiB
Bash
46 lines
1.3 KiB
Bash
#!/bin/bash
|
|
|
|
cliHandlePeerCommands()
|
|
{
|
|
local action="$initial_command2"
|
|
local arg1="$initial_command3"
|
|
local arg2="$initial_command4"
|
|
local arg3="$initial_command5"
|
|
local arg4="$initial_command6"
|
|
|
|
case "$action" in
|
|
""|help)
|
|
cliShowPeerHelp
|
|
;;
|
|
list)
|
|
peerList
|
|
;;
|
|
get)
|
|
[[ -z "$arg1" ]] && { isNotice "Usage: peer get <name>"; return; }
|
|
peerGet "$arg1"
|
|
;;
|
|
add)
|
|
# peer add <name> <kind> [k=v] [k=v]
|
|
# Up to two k=v pairs from initial_command5..6 — covers backup-channel's
|
|
# hostname + loc_idx, which is the only kind that's wired today.
|
|
[[ -z "$arg1" || -z "$arg2" ]] && { isNotice "Usage: peer add <name> <kind> [key=value ...]"; return; }
|
|
peerAdd "$arg1" "$arg2" "$arg3" "$arg4"
|
|
;;
|
|
remove|rm|delete)
|
|
[[ -z "$arg1" ]] && { isNotice "Usage: peer remove <name>"; return; }
|
|
peerRemove "$arg1"
|
|
;;
|
|
check)
|
|
if [[ -z "$arg1" ]]; then
|
|
peerCheckAll
|
|
else
|
|
peerCheckReachable "$arg1"
|
|
fi
|
|
;;
|
|
*)
|
|
isNotice "Invalid peer action: $action"
|
|
cliShowPeerHelp
|
|
;;
|
|
esac
|
|
}
|