Claude
b0698e0a66
`tools/` is for libraries (arti-build); shell-based interop harnesses
that drive the `amy` binary belong with the CLI module. New layout:
cli/tests/
├── lib.sh # shared logging + result tracking
├── headless/helpers.sh # shared amy_a / amy_json / assertions
├── marmot/ # MLS group-messaging interop (vs whitenoise-rs)
│ ├── marmot-interop.sh
│ ├── marmot-interop-headless.sh
│ ├── setup.sh
│ ├── tests-create.sh
│ ├── tests-manage.sh
│ ├── tests-extras.sh
│ └── patches/
└── dm/ # NIP-17 DM interop (amy ↔ amy)
├── dm-interop-headless.sh
├── setup.sh
└── tests-dm.sh
Per-suite changes:
- Each suite owns its own setup.sh; previously the Marmot setup was at
headless/setup.sh and the DM setup at headless/setup-dm.sh, which
implied shared infra they don't actually share.
- `cli/tests/lib.sh` and `cli/tests/headless/helpers.sh` are the only
shared bits across suites.
- The DM harness still reuses Marmot's `start_local_relay` /
`stop_local_relay` (sourced via `../marmot/setup.sh`) — same relay
binary, no duplication.
- All sourcing paths updated; REPO_ROOT now climbs three levels (was
two when the harness lived under `tools/`); patches/ is now a sibling
of marmot/setup.sh rather than under marmot/headless/.
- `.gitignore` updated to cover both suites' state dirs.
cli/ROADMAP.md and cli/tests/README.md updated to point at the new paths.
No behavioural change — every test runs the same code; only the file
layout and source paths moved.
113 lines
4.3 KiB
Bash
113 lines
4.3 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). We reuse A_DIR for parity
|
|
# with the existing harness files; D_DIR is new.
|
|
amy_a() { "$AMY_BIN" --data-dir "$A_DIR" "$@"; }
|
|
amy_d() { "$AMY_BIN" --data-dir "$D_DIR" "$@"; }
|
|
|
|
# --- identity bootstrap ------------------------------------------------------
|
|
ensure_identity_for() {
|
|
local who="$1" dir="$2"
|
|
step "initialising Identity $who (amy at $dir)"
|
|
local out
|
|
out=$("$AMY_BIN" --data-dir "$dir" 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_BIN" --data-dir "$A_DIR" relay add "$RELAY_URL" --type all >/dev/null
|
|
"$AMY_BIN" --data-dir "$D_DIR" 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"
|
|
}
|