99586fbe7e
There is no installed base to protect, so the self-contained
`--data-dir P` escape hatch goes away entirely. amy now has exactly
one layout — the production multi-account one — and tests exercise
that same code path. Drops one global flag, one DataDir construction
mode, and the "tests use a different code path than users" footgun.
Layout (unchanged from the previous commits — just the only mode now):
~/.amy/
├── current # `amy use NAME` marker
├── shared/
│ └── events-store/ # FsEventStore, one per machine
├── alice/
│ ├── identity.json
│ ├── state.json
│ ├── aliases.json # {"alice": "<own npub>"} after init
│ └── marmot/
└── bob/ ...
`DataDir.DEFAULT_ROOT` reads `$HOME` directly (falling back to
`user.home`) because JDK 21 resolves `user.home` via getpwuid and
ignores `$HOME` — which would have broken the standard CLI test
isolation pattern of `HOME=/tmp/foo amy …` (the same convention
git, gpg, npm follow).
Test sweep:
- `cli/tests/headless/helpers.sh`, `cli/tests/dm/setup.sh`,
`cli/tests/cache/cache-headless.sh` wrappers all switch to
`HOME=$STATE_DIR amy --name X …`.
- `ensure_identity_for` drops its `dir` parameter; the function and
every harness call site go through `--name` only.
- `A_DIR`/`B_DIR`/`D_DIR` get repointed at `$STATE_DIR/.amy/X`. The
one consumer (`cache-headless.sh`'s T6 `relays.json` check) still
works since it's just a path probe.
- `cli/tests/dm/tests-dm.sh` ghost identities get their own
short-lived `$HOME` so they don't pollute the main test root.
Cache-test T4 inverts: pre-shared-store, "B has not seen A → first
profile show is a relay miss, second is a cache hit" tested
per-account caching. With one shared events-store, B's first lookup
of A is already a cache hit because A wrote kind:0 there during
bootstrap. T4 now asserts that — drops the stale "second lookup hits
cache" half. T7 (no-identity maintenance verbs) gets a fresh fake
`$HOME` plus a throwaway `--name` so the empty store has no inherited
events.
Docs (README + DEVELOPMENT) rewritten to match — quick-start now uses
`amy --name alice create`, the on-disk-layout section shows the new
tree, and the global-flags table replaces `--data-dir` with `--name`
plus the new `amy use` verb.
120 lines
4.8 KiB
Bash
120 lines
4.8 KiB
Bash
# shellcheck shell=bash
|
|
#
|
|
# setup.sh — amy-only preflight + identity bootstrap for the
|
|
# NIP-17 DM interop harness. Much slimmer than the Marmot setup:
|
|
#
|
|
# - Builds `amy` (same retry-on-503 logic as setup.sh).
|
|
# - Builds nostr-rs-relay if missing.
|
|
# - Bootstraps two fresh amy identities (A and D), each with its own
|
|
# `--data-dir`, both pointed at the loopback relay.
|
|
# - Publishes kind:10050 (plus NIP-65) for both so NIP-17's strict
|
|
# recipient-inbox routing has something to resolve to.
|
|
#
|
|
# The heavy `start_local_relay` / `stop_local_relay` helpers live in
|
|
# the Marmot harness's setup.sh and are sourced by the top-level harness.
|
|
|
|
# --- preflight (amy + relay only, no wn / Marmot patches) -------------------
|
|
preflight_dm() {
|
|
banner "Preflight (DM harness)"
|
|
for cmd in jq git cargo; do
|
|
if ! command -v "$cmd" >/dev/null 2>&1; then
|
|
fail_msg "missing required tool: $cmd"
|
|
exit 1
|
|
fi
|
|
info "$cmd: $(command -v "$cmd")"
|
|
done
|
|
|
|
if [[ ! -x "$AMY_BIN" ]]; then
|
|
if [[ "$NO_BUILD" -eq 1 ]]; then
|
|
fail_msg "amy not found at $AMY_BIN and --no-build set"; exit 1
|
|
fi
|
|
# Gradle + jitpack/dl.google.com occasionally return transient 503s;
|
|
# retry so a single bad roll doesn't tank the whole harness.
|
|
local attempt max=4
|
|
for attempt in $(seq 1 $max); do
|
|
step "building :cli:installDist (attempt $attempt/$max)"
|
|
if ( cd "$REPO_ROOT" && ./gradlew :cli:installDist ) 2>&1 | tee -a "$LOG_FILE" \
|
|
&& [[ -x "$AMY_BIN" ]]; then
|
|
break
|
|
fi
|
|
[[ "$attempt" -lt "$max" ]] && warn "gradle build failed — retrying"
|
|
done
|
|
fi
|
|
[[ -x "$AMY_BIN" ]] || { fail_msg "amy still missing after build"; exit 1; }
|
|
info "amy: $AMY_BIN"
|
|
|
|
# nostr-rs-relay (same build path as the Marmot harness).
|
|
if [[ ! -x "$RELAY_BIN" ]]; then
|
|
if [[ "$NO_BUILD" -eq 1 ]]; then
|
|
fail_msg "nostr-rs-relay not found at $RELAY_BIN and --no-build set"; exit 1
|
|
fi
|
|
if [[ ! -d "$RELAY_REPO/.git" ]]; then
|
|
step "cloning nostr-rs-relay into $RELAY_REPO"
|
|
git clone --depth 1 https://github.com/scsibug/nostr-rs-relay "$RELAY_REPO" \
|
|
2>&1 | tee -a "$LOG_FILE"
|
|
fi
|
|
local attempt max=4
|
|
for attempt in $(seq 1 $max); do
|
|
step "building nostr-rs-relay (attempt $attempt/$max, ~3 min first run)"
|
|
( cd "$RELAY_REPO" && cargo build --release --bin nostr-rs-relay ) \
|
|
2>&1 | tee -a "$LOG_FILE"
|
|
[[ -x "$RELAY_BIN" ]] && break
|
|
[[ "$attempt" -lt "$max" ]] && warn "nostr-rs-relay build failed — retrying"
|
|
done
|
|
[[ -x "$RELAY_BIN" ]] || {
|
|
fail_msg "nostr-rs-relay still missing after $max attempts"; exit 1
|
|
}
|
|
fi
|
|
info "relay bin: $RELAY_BIN"
|
|
}
|
|
|
|
# --- amy identity wrappers ---------------------------------------------------
|
|
# Two identities: A (sender) and D (recipient), both inside the same
|
|
# $STATE_DIR/.amy tree. They share $STATE_DIR/.amy/shared/events-store/
|
|
# — the same code path real users hit with multiple accounts. The
|
|
# enclosing harness sets STATE_DIR to a fresh tempdir per run, so amy
|
|
# sees a virgin home each time.
|
|
#
|
|
# `--secret-backend=plaintext` keeps these throwaway interop runs headless —
|
|
# the default `auto` would try the OS keychain (not available in CI) and then
|
|
# ask for a NIP-49 passphrase. Plaintext still writes 0600-owner-only.
|
|
amy_a() { HOME="$STATE_DIR" "$AMY_BIN" --name A --secret-backend plaintext --json "$@"; }
|
|
amy_d() { HOME="$STATE_DIR" "$AMY_BIN" --name D --secret-backend plaintext --json "$@"; }
|
|
|
|
# --- identity bootstrap ------------------------------------------------------
|
|
ensure_identity_for() {
|
|
local who="$1"
|
|
step "initialising Identity $who (amy at \$HOME=$STATE_DIR --name $who)"
|
|
local out
|
|
out=$(HOME="$STATE_DIR" "$AMY_BIN" --name "$who" --secret-backend plaintext --json init) || {
|
|
fail_msg "amy init failed for $who: $out"; exit 1
|
|
}
|
|
local npub hex
|
|
npub=$(printf '%s' "$out" | jq -r '.npub')
|
|
hex=$(printf '%s' "$out" | jq -r '.hex')
|
|
case "$who" in
|
|
A) A_NPUB="$npub"; A_HEX="$hex" ;;
|
|
D) D_NPUB="$npub"; D_HEX="$hex" ;;
|
|
esac
|
|
info "$who npub: $npub"
|
|
info "$who hex: $hex"
|
|
}
|
|
|
|
# --- relay wiring ------------------------------------------------------------
|
|
# Point both identities at the loopback relay (all three buckets:
|
|
# nip65 / inbox / key_package), then publish each identity's kind:10050
|
|
# so the DM strict-relay routing has something to resolve to.
|
|
configure_relays_dm() {
|
|
banner "Configuring relays → $RELAY_URL"
|
|
amy_a relay add "$RELAY_URL" --type all >/dev/null
|
|
amy_d relay add "$RELAY_URL" --type all >/dev/null
|
|
|
|
step "publishing A's NIP-65 + kind:10050 lists"
|
|
amy_a relay publish-lists >>"$LOG_FILE" 2>&1 \
|
|
|| warn "amy_a relay publish-lists failed"
|
|
|
|
step "publishing D's NIP-65 + kind:10050 lists"
|
|
amy_d relay publish-lists >>"$LOG_FILE" 2>&1 \
|
|
|| warn "amy_d relay publish-lists failed"
|
|
}
|