mirror of
https://github.com/hanzoai/bot.git
synced 2026-11-02 07:30:08 +00:00
zeekay
acaeda400a
Three coordinated things:
1. Resolve the committed upstream/main merge conflicts. 94 files were
sitting with raw <<<<<<< HEAD ... >>>>>>> upstream/main blocks. Every
conflict had HanzoBot/Bot on HEAD and OpenClaw on upstream. Resolved
by keeping HEAD everywhere — 540 conflict blocks.
2. Rewrite remaining OpenClaw text refs.
OPENCLAW → HANZO_BOT
OpenClaw → HanzoBot (PascalCase type identifiers)
openclaw → bot (codebase convention — botToken,
botUsername etc.; avoids invalid
hyphenated JS identifiers)
openclaw[_]/openclaw[A-Z] → bot[_]/bot[A-Z] (compound)
ai.openclaw.x → ai.hanzo.bot.x (JVM package path)
3. Delete or rename openclaw-named file paths (116 of them). Dead
duplicates with a Bot-named canonical from the partial migration:
deleted. Otherwise renamed.
ai/openclaw/** → deleted (ai/hanzo/bot/** canonical)
Sources/OpenClaw*/ → deleted (Sources/Bot* canonical)
Tests/OpenClawIPCTests/ → deleted (Tests/BotIPCTests canonical)
OpenClawKit/ → deleted (BotKit canonical)
openclaw-tools.*.ts → deleted (bot-tools.*.ts canonical)
openclaw-root.ts etc. → deleted (bot-root.ts canonical)
types.openclaw.ts → deleted (types.bot.ts canonical)
extensions/*/openclaw.plugin.json → renamed hanzo-bot.plugin.json
docs/start/openclaw.md → renamed hanzo-bot.md (+ zh-CN)
docs/assets/openclaw-*.png, whatsapp-openclaw*.jpg → deleted
scripts/.../openclaw-* → deleted (bot/hanzo-bot parallels)
openclaw.mjs → deleted (hanzo-bot.mjs is package.bin)
Then patched 65 broken JS/TS import strings where hanzo-bot had ended
up inside an import path ('./types.hanzo-bot.js' → './types.bot.js'
etc., since the on-disk filename uses the brand-neutral bot- prefix).
Pre-existing lint debt cleaned up to get oxlint --type-aware to 0/0:
removed the dead i18n test that referenced a path no longer existing;
defined the missing DIDConfig and WalletConfig types in types.base.ts
(they were imported but never declared); dropped unused imports;
collapsed redundant type assertion and a tautological meta.bot lookup
that the openclaw→bot rename made redundant.
The a2ui.bundle.js generated artifact is kept at its pre-rebrand
contents — it gets regenerated by 'pnpm canvas:a2ui:bundle' from
sources I cannot rebuild in this commit; the source side is clean.
Verified: 0 occurrences of openclaw (case-insensitive) in tree source
content, 0 file or directory paths with openclaw in the name; oxlint
--type-aware src test reports 0/0.
90 lines
2.8 KiB
Bash
Executable File
90 lines
2.8 KiB
Bash
Executable File
#!/bin/bash
|
|
# Auth Expiry Monitor
|
|
# Run via cron or systemd timer to get proactive notifications
|
|
# before Claude Code auth expires.
|
|
#
|
|
# Suggested cron: */30 * * * * /home/admin/hanzo-bot/scripts/auth-monitor.sh
|
|
#
|
|
# Environment variables:
|
|
# NOTIFY_PHONE - Phone number to send HanzoBot notification (e.g., +1234567890)
|
|
# NOTIFY_NTFY - ntfy.sh topic for push notifications (e.g., hanzo-bot-alerts)
|
|
# WARN_HOURS - Hours before expiry to warn (default: 2)
|
|
|
|
set -euo pipefail
|
|
|
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
CLAUDE_CREDS="$HOME/.claude/.credentials.json"
|
|
STATE_FILE="$HOME/.hanzo-bot/auth-monitor-state"
|
|
|
|
# Configuration
|
|
WARN_HOURS="${WARN_HOURS:-2}"
|
|
NOTIFY_PHONE="${NOTIFY_PHONE:-}"
|
|
NOTIFY_NTFY="${NOTIFY_NTFY:-}"
|
|
|
|
# State tracking to avoid spam
|
|
mkdir -p "$(dirname "$STATE_FILE")"
|
|
LAST_NOTIFIED=$(cat "$STATE_FILE" 2>/dev/null || echo "0")
|
|
NOW=$(date +%s)
|
|
|
|
# Only notify once per hour max
|
|
MIN_INTERVAL=3600
|
|
|
|
send_notification() {
|
|
local message="$1"
|
|
local priority="${2:-default}"
|
|
|
|
echo "$(date '+%Y-%m-%d %H:%M:%S') - $message"
|
|
|
|
# Check if we notified recently
|
|
if [ $((NOW - LAST_NOTIFIED)) -lt $MIN_INTERVAL ]; then
|
|
echo "Skipping notification (sent recently)"
|
|
return
|
|
fi
|
|
|
|
# Send via HanzoBot if phone configured and auth still valid
|
|
if [ -n "$NOTIFY_PHONE" ]; then
|
|
# Check if we can still use hanzo-bot
|
|
if "$SCRIPT_DIR/claude-auth-status.sh" simple 2>/dev/null | grep -q "OK\|EXPIRING"; then
|
|
echo "Sending via HanzoBot to $NOTIFY_PHONE..."
|
|
hanzo-bot send --to "$NOTIFY_PHONE" --message "$message" 2>/dev/null || true
|
|
fi
|
|
fi
|
|
|
|
# Send via ntfy.sh if configured
|
|
if [ -n "$NOTIFY_NTFY" ]; then
|
|
echo "Sending via ntfy.sh to $NOTIFY_NTFY..."
|
|
curl -s -o /dev/null \
|
|
-H "Title: HanzoBot Auth Alert" \
|
|
-H "Priority: $priority" \
|
|
-H "Tags: warning,key" \
|
|
-d "$message" \
|
|
"https://ntfy.sh/$NOTIFY_NTFY" || true
|
|
fi
|
|
|
|
# Update state
|
|
echo "$NOW" > "$STATE_FILE"
|
|
}
|
|
|
|
# Check auth status
|
|
if [ ! -f "$CLAUDE_CREDS" ]; then
|
|
send_notification "Claude Code credentials missing! Run: claude setup-token" "high"
|
|
exit 1
|
|
fi
|
|
|
|
EXPIRES_AT=$(jq -r '.claudeAiOauth.expiresAt // 0' "$CLAUDE_CREDS")
|
|
NOW_MS=$((NOW * 1000))
|
|
DIFF_MS=$((EXPIRES_AT - NOW_MS))
|
|
HOURS_LEFT=$((DIFF_MS / 3600000))
|
|
MINS_LEFT=$(((DIFF_MS % 3600000) / 60000))
|
|
|
|
if [ "$DIFF_MS" -lt 0 ]; then
|
|
send_notification "Claude Code auth EXPIRED! HanzoBot is down. Run: ssh l36 '~/hanzo-bot/scripts/mobile-reauth.sh'" "urgent"
|
|
exit 1
|
|
elif [ "$HOURS_LEFT" -lt "$WARN_HOURS" ]; then
|
|
send_notification "Claude Code auth expires in ${HOURS_LEFT}h ${MINS_LEFT}m. Consider re-auth soon." "high"
|
|
exit 0
|
|
else
|
|
echo "$(date '+%Y-%m-%d %H:%M:%S') - Auth OK: ${HOURS_LEFT}h ${MINS_LEFT}m remaining"
|
|
exit 0
|
|
fi
|