Claude
03eb7be509
amy's default stdout is now a YAML-ish render of the underlying result
map; the previous single-line JSON contract moves behind a global
`--json` flag. Errors mirror the same rule (`error: <code>: <detail>`
on stderr by default, JSON `{"error":...,"detail":...}` under --json).
Exit codes (0/1/2/124) and the --json shape itself are unchanged —
only the default presentation flips.
- Replaces Json.writeLine / Json.error with mode-aware
Output.emit / Output.error. The same Jackson mapper is reused for
on-disk JSON via Output.mapper.
- Adds `--json` to the global flag set in Main.kt; honoured even when
argument parsing fails so error JSON keeps shape under --json.
- Updates the test harness wrappers (amy_a / amy_b / amy_d in
cli/tests/{headless,dm,cache}/) and the few direct $AMY_BIN call
sites whose stdout is consumed via $() / 2>&1 — they now pass
--json so the existing jq pipelines keep working.
- Rewrites the README "Output contract" and DEVELOPMENT design
principles to describe the new default, and clarifies that only
--json is the public API; the text shape is allowed to drift.
117 lines
4.6 KiB
Bash
117 lines
4.6 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.
|
|
#
|
|
# `--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() { "$AMY_BIN" --data-dir "$A_DIR" --secret-backend plaintext --json "$@"; }
|
|
amy_d() { "$AMY_BIN" --data-dir "$D_DIR" --secret-backend plaintext --json "$@"; }
|
|
|
|
# --- 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" --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_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"
|
|
}
|