mirror of
https://github.com/kellymichels/zscripts-token-savers
synced 2026-10-07 07:18:18 +00:00
09f86c1cba
* feat(bash): native bash port of all z-scripts for Linux/macOS/WSL Full port: zhelpers.sh library (jq config, ssh, http/tcp, archive builder, build-version, motd, port-kill), all commands (zstart/zkill/zrestart/zstop, zdeploy with 5 kind handlers, zec2/zec2online/zrepair, zbackup/zbackup_ec2/ zsync/zbackup_and_sync, zstart_docker, zsetup_mail, setup_backup_schedule via cron), Unix-path zconfig.example.json, and a bash/README.md. Verified: bash -n clean on all scripts; archive exclusions, config semantics, and zec2 tested against the real config and live server from Git Bash. Needs a Linux/macOS/WSL shakedown for lsof/rsync/nohup paths before merging. * chore: pin line endings (.gitattributes) - bash LF, powershell CRLF * docs(readme): point Linux/macOS/WSL users at the bash port * fix(bash): don't run the Windows venv python.exe on WSL/Linux/macOS zstart's venv detection fell back to .venv/Scripts/python.exe (a Windows binary) whenever it existed. On a Windows-built project accessed from WSL that file sits on the mount and looks executable, so it got picked and failed with 'exec format error' instead of falling through to python3. Guard that branch to Windows-family shells (msys/cygwin), where a .exe can actually run. Verified on WSL: zstart --detached now backgrounds a stdlib app via python3, serves HTTP 200, logs to /tmp/zstart-<key>.log, and zkill terminates it and frees the port. * feat(bash): add token-usage tracking to the bash port (#6) Adds z_track_start/z_track_stop + z_record to zhelpers.sh and wires z_track_start into every command script. Each run now captures its own output volume (FIFO+tee, ANSI stripped), prints the '--- N lines / N chars / ~N tokens est. (Claude Code) ---' footer, and appends one JSONL row per top-level run in the same shape as the PowerShell tokens.jsonl. A nested-run guard keeps zrestart from double-counting its zkill/zstart children. Data dir precedence: $ZTOKENS_DATA, config ztokens.dataDir, sibling ../../ztokens/data, else ~/.ztokens/data. Docs + example config updated. Verified on WSL (isolated data dir): single run records correctly; nested zrestart produces one combined record, not three; est = round(chars/3.5).
81 lines
2.7 KiB
Bash
81 lines
2.7 KiB
Bash
#!/usr/bin/env bash
|
|
# Evomedia.net Token Savers — https://github.com/kellymichels/zscripts-token-savers
|
|
# Created by Kelly Michels · dev@evomedia.net
|
|
# Licensed under the MIT License. See LICENSE.
|
|
#
|
|
# zrepair — audit and repair container/proxy routing on the server, then smoke test.
|
|
#
|
|
# Usage:
|
|
# zrepair <project> [<project> ...]
|
|
#
|
|
# For each project: shows compose status, starts the stack if it's down,
|
|
# validates the edge proxy's nginx config (once, if an edge project is defined),
|
|
# and smoke-tests the live domain.
|
|
|
|
set -uo pipefail
|
|
source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/zhelpers.sh"
|
|
z_track_start "$@"
|
|
z_need_config
|
|
z_require ssh curl
|
|
|
|
if [ $# -eq 0 ]; then
|
|
printf '\n'; warn "Usage: zrepair <project> [<project> ...]"
|
|
dim " Projects in zconfig.json: $(zproj_csv)"
|
|
exit 1
|
|
fi
|
|
|
|
HOST="$(zec2_ip)"
|
|
|
|
printf '\n'; info "=== Routing repair & diagnostics ==="
|
|
dim "Target host: $HOST"
|
|
|
|
# Validate the edge proxy config once up front, if one is defined.
|
|
EDGE_KEY="$(zedge_key)"
|
|
if [ -n "$EDGE_KEY" ]; then
|
|
pc="$(zproj "$EDGE_KEY" .proxyContainer)"
|
|
if [ -n "$pc" ]; then
|
|
printf '\n'; warn " [edge] Validating nginx config in proxy container '$pc'..."
|
|
zec2_step "nginx -t in $pc" "sudo docker exec $pc nginx -t 2>&1" || exit 1
|
|
fi
|
|
fi
|
|
|
|
for key in "$@"; do
|
|
zproj_require "$key"
|
|
label="$(zproj "$key" .label)"; [ -n "$label" ] || label="$key"
|
|
compose_dir="$(zremote_compose_dir "$key")"
|
|
domain="$(zproj "$key" .domain)"
|
|
|
|
printf '\n'
|
|
info "========================================="
|
|
info "=== Repairing $label ($key) ==="
|
|
info "========================================="
|
|
printf '\n'
|
|
|
|
warn " [1/3] Compose status on the server..."
|
|
zec2_step "Check compose status" \
|
|
"cd $compose_dir || exit 1; echo 'Running containers:'; sudo docker compose ps" || exit 1
|
|
|
|
warn " [2/3] Ensuring stack is up..."
|
|
zec2_step "Ensure stack is up" \
|
|
"cd $compose_dir || exit 1; if ! sudo docker compose ps | grep -q Up; then echo ' [Action] Stack is down. Starting...'; sudo docker compose up -d; else echo ' [OK] Stack is active and UP.'; fi" || exit 1
|
|
|
|
if [ -n "$domain" ]; then
|
|
warn " [3/3] Smoke test for https://$domain..."
|
|
code="$(http_code "http://$HOST/" "$domain")"
|
|
if [ "$code" = "000" ]; then
|
|
err " FAIL - smoke test failed: no HTTP response"
|
|
elif [ "$code" -lt 400 ]; then
|
|
ok " PASS - responded with HTTP $code (Online)"
|
|
elif [ "$code" -lt 500 ]; then
|
|
ok " PASS - responded with HTTP $code (Online/Redirect or auth)"
|
|
else
|
|
warn " WARNING - unexpected HTTP $code"
|
|
fi
|
|
else
|
|
warn " [3/3] No domain configured - skipping smoke test."
|
|
fi
|
|
done
|
|
|
|
printf '\n'; ok "=== Repair & diagnostics completed ==="
|
|
printf '\n'
|