refactor: large codebase cleanup - consolidate schemas, migrate to Drizzle ORM, extract frontend components, modernize Docker builds
Build & Deploy / build-and-push (discord-gateway) (push) Failing after 2m22s
Build & Deploy / build-and-push (backend) (push) Failing after 3m22s
Build & Deploy / build-and-push (proxy) (push) Successful in 1m36s
Build & Deploy / deploy (push) Skipped
Build & Deploy / build-and-push (discord-gateway) (push) Failing after 2m22s
Build & Deploy / build-and-push (backend) (push) Failing after 3m22s
Build & Deploy / build-and-push (proxy) (push) Successful in 1m36s
Build & Deploy / deploy (push) Skipped
- Consolidate all DB schema definitions into packages/shared as single source of truth - Migrate backend from raw SQL to Drizzle ORM across all modules - Extract frontend inline UI into separate component files - Refactor discord-gateway circuitBreaker into conversationState + moderationState - Convert messageStore to Proxy singleton pattern - Add validateBody/validateQuery middleware + Zod schemas for API endpoints - Modernize Docker builds with multi-stage + pnpm deploy - Migrate CI/CD from deployment to image-based pipeline - Remove 60+ unused/dead files (~15K lines) - Update color scheme from sky-blue to teal-cyan - Move DB connection management to @bete/shared/database Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 4.8
parent
63f21513bd
commit
5802d02e29
@@ -1,185 +1,31 @@
|
||||
#!/bin/bash
|
||||
# ─── Bete Deploy Script ──────────────────────────────────────────────────────
|
||||
# Builds selected services locally and deploys compiled JS/WASM artifacts to the
|
||||
# VPS via bind-mounted host directories. Changes survive container restarts
|
||||
# because the Docker containers use bind mounts, not docker exec tar-pipes.
|
||||
#
|
||||
# This script is CI-provider neutral. GitHub/GitLab/Gitea workflows and local
|
||||
# shells must provide deployment credentials through environment variables.
|
||||
#
|
||||
# Usage:
|
||||
# ./deploy.sh # build + deploy all services
|
||||
# ./deploy.sh --frontend # frontend (Next.js) only
|
||||
# ./deploy.sh --backend # backend JS only
|
||||
# ./deploy.sh --gateway # discord-gateway JS only
|
||||
# ./deploy.sh --all # same as no-flag (default)
|
||||
# ./deploy.sh --no-build # skip builds, just copy files
|
||||
# ./deploy.sh --help # show this message
|
||||
#
|
||||
# Required env:
|
||||
# VPS_HOST — VPS IP/hostname
|
||||
# VPS_USER — SSH user
|
||||
# VPS_SSH_KEY — path to SSH private key or raw private-key contents
|
||||
#
|
||||
# Optional env:
|
||||
# ADMIN_PASSWORD — verify backend health after deploy
|
||||
# ──────────────────────────────────────────────────────────────────────────────
|
||||
set -euo pipefail
|
||||
|
||||
set -eu
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
INFRA_DIR="$SCRIPT_DIR/infra/docker"
|
||||
|
||||
# ── Config ────────────────────────────────────────────────────────────────────
|
||||
APP_DIR="/opt/imphenbot"
|
||||
COMPOSE_FILE="infra/docker/docker-compose.yml"
|
||||
: "${VPS_HOST:?required}"
|
||||
: "${VPS_USER:?required}"
|
||||
: "${VPS_SSH_KEY:?required}"
|
||||
|
||||
# Local build output directories (relative to repo root)
|
||||
FRONTEND_DIST="services/frontend/out"
|
||||
BACKEND_DIST="services/backend/dist"
|
||||
GATEWAY_DIST="services/discord-gateway/dist"
|
||||
echo "=== Deploy to $VPS_HOST ==="
|
||||
|
||||
# Remote bind-mount paths (must match infra/docker/docker-compose.yml volumes)
|
||||
REMOTE_BASE="${APP_DIR}/infra/docker"
|
||||
REMOTE_FRONTEND="${REMOTE_BASE}/frontend-dist"
|
||||
REMOTE_BACKEND="${REMOTE_BASE}/backend-dist"
|
||||
REMOTE_GATEWAY="${REMOTE_BASE}/gateway-dist"
|
||||
|
||||
# ── Parse args ────────────────────────────────────────────────────────────────
|
||||
DO_BUILD=true
|
||||
DO_ALL=false
|
||||
DO_FRONTEND=false
|
||||
DO_BACKEND=false
|
||||
DO_GATEWAY=false
|
||||
|
||||
for arg in "$@"; do
|
||||
case "$arg" in
|
||||
--help|-h)
|
||||
sed -n '2,/^$/ s/^# //p' "$0"
|
||||
exit 0
|
||||
;;
|
||||
--all|--full) DO_ALL=true ;;
|
||||
--frontend) DO_FRONTEND=true ;;
|
||||
--backend) DO_BACKEND=true ;;
|
||||
--gateway) DO_GATEWAY=true ;;
|
||||
--no-build) DO_BUILD=false ;;
|
||||
esac
|
||||
done
|
||||
|
||||
# If no service flag given, or --all, default to all
|
||||
if ! $DO_FRONTEND && ! $DO_BACKEND && ! $DO_GATEWAY || $DO_ALL; then
|
||||
DO_FRONTEND=true
|
||||
DO_BACKEND=true
|
||||
DO_GATEWAY=true
|
||||
# Copy local .env if it exists (overrides CI env)
|
||||
if [ -f "$INFRA_DIR/.env" ]; then
|
||||
scp -i "$VPS_SSH_KEY" "$INFRA_DIR/.env" "$VPS_USER@$VPS_HOST:/opt/imphenbot/infra/docker/.env"
|
||||
fi
|
||||
|
||||
# ── Validate and prepare SSH key ─────────────────────────────────────────────
|
||||
: "${VPS_HOST:?VPS_HOST not set}"
|
||||
: "${VPS_USER:?VPS_USER not set}"
|
||||
: "${VPS_SSH_KEY:?VPS_SSH_KEY not set}"
|
||||
ssh -i "$VPS_SSH_KEY" "$VPS_USER@$VPS_HOST" << 'REMOTESCRIPT'
|
||||
set -eu
|
||||
cd /opt/imphenbot/infra/docker
|
||||
echo "=== Pulling images ==="
|
||||
docker compose pull
|
||||
echo "=== Restarting containers ==="
|
||||
docker compose up -d --remove-orphans
|
||||
echo "=== Cleaning up ==="
|
||||
docker image prune -f
|
||||
echo "=== Active containers ==="
|
||||
docker ps --filter "name=imphenbot" --format "table {{.Names}} {{.Image}} {{.Status}}"
|
||||
REMOTESCRIPT
|
||||
|
||||
TEMP_SSH_KEY=""
|
||||
cleanup() {
|
||||
if [ -n "$TEMP_SSH_KEY" ]; then
|
||||
rm -f "$TEMP_SSH_KEY"
|
||||
fi
|
||||
}
|
||||
trap cleanup EXIT
|
||||
|
||||
if [ -f "$VPS_SSH_KEY" ]; then
|
||||
SSH_KEY_PATH="$VPS_SSH_KEY"
|
||||
else
|
||||
TEMP_SSH_KEY=$(mktemp)
|
||||
printf '%s\n' "$VPS_SSH_KEY" > "$TEMP_SSH_KEY"
|
||||
chmod 600 "$TEMP_SSH_KEY"
|
||||
SSH_KEY_PATH="$TEMP_SSH_KEY"
|
||||
fi
|
||||
|
||||
SSH_DEST="${VPS_USER}@${VPS_HOST}"
|
||||
SSH_OPTS="-i $SSH_KEY_PATH -o StrictHostKeyChecking=accept-new"
|
||||
|
||||
# ── Helpers ───────────────────────────────────────────────────────────────────
|
||||
vps() { ssh $SSH_OPTS "$SSH_DEST" "$@"; }
|
||||
log() { echo "→ $*"; }
|
||||
ok() { echo "✓ $*"; }
|
||||
die() { echo "✗ $*"; exit 1; }
|
||||
|
||||
# ── 1. Ensure remote bind-mount directories exist ────────────────────────────
|
||||
log "Ensuring remote bind-mount directories exist..."
|
||||
vps "mkdir -p '$REMOTE_FRONTEND' '$REMOTE_BACKEND' '$REMOTE_GATEWAY'"
|
||||
ok "Remote directories ready"
|
||||
|
||||
# ── 2. Build ──────────────────────────────────────────────────────────────────
|
||||
if $DO_BUILD; then
|
||||
REPO_ROOT=$(cd "$(dirname "$0")" && pwd)
|
||||
cd "$REPO_ROOT"
|
||||
|
||||
if $DO_BACKEND; then
|
||||
log "Building backend (TypeScript)..."
|
||||
pnpm --filter './services/backend' run build 2>&1 | tail -3 || die "Backend build failed"
|
||||
ok "Backend built"
|
||||
fi
|
||||
|
||||
if $DO_FRONTEND; then
|
||||
log "Building frontend (Next.js)..."
|
||||
cd services/frontend
|
||||
bun run build 2>&1 | tail -5 || die "Frontend build failed"
|
||||
cd "$REPO_ROOT"
|
||||
ok "Frontend built"
|
||||
fi
|
||||
|
||||
if $DO_GATEWAY; then
|
||||
log "Building gateway (TypeScript)..."
|
||||
pnpm --filter '@bete/discord-gateway' run build 2>&1 | tail -3 || die "Gateway build failed"
|
||||
ok "Gateway built"
|
||||
fi
|
||||
else
|
||||
log "Skipping build (--no-build)"
|
||||
fi
|
||||
|
||||
# ── 3. Deploy to VPS (via tar pipe to remote host directory) ──────────────────
|
||||
|
||||
deploy_to_remote() {
|
||||
local src="$1"
|
||||
local remote_dir="$2"
|
||||
local name="$3"
|
||||
|
||||
if [ ! -d "$src" ] || [ -z "$(ls -A "$src" 2>/dev/null)" ]; then
|
||||
log "WARN: $src is empty or missing — skipping $name"
|
||||
return
|
||||
fi
|
||||
|
||||
log "Deploying $name..."
|
||||
# Atomic swap: extract into a temp dir, then rename — avoids partial deploy
|
||||
vps "rm -rf '${remote_dir}.new' && mkdir -p '${remote_dir}.new'"
|
||||
tar czf - -C "$src" . | vps "tar xzf - -C '${remote_dir}.new'"
|
||||
vps "rm -rf '${remote_dir}.old' && mv '${remote_dir}' '${remote_dir}.old' 2>/dev/null; mv '${remote_dir}.new' '${remote_dir}' && rm -rf '${remote_dir}.old'"
|
||||
log "→ $name copied to host — restarting container..."
|
||||
}
|
||||
|
||||
if $DO_FRONTEND; then
|
||||
deploy_to_remote "$FRONTEND_DIST" "$REMOTE_FRONTEND" "frontend"
|
||||
vps "docker restart imphenbot-proxy" > /dev/null 2>&1
|
||||
ok "Frontend deployed"
|
||||
fi
|
||||
|
||||
if $DO_BACKEND; then
|
||||
deploy_to_remote "$BACKEND_DIST" "$REMOTE_BACKEND" "backend"
|
||||
vps "docker restart imphenbot-backend" > /dev/null 2>&1
|
||||
ok "Backend deployed"
|
||||
fi
|
||||
|
||||
if $DO_GATEWAY; then
|
||||
deploy_to_remote "$GATEWAY_DIST" "$REMOTE_GATEWAY" "gateway"
|
||||
vps "docker restart imphenbot-discord-gateway" > /dev/null 2>&1
|
||||
ok "Gateway deployed"
|
||||
fi
|
||||
|
||||
# ── 4. Verify ─────────────────────────────────────────────────────────────────
|
||||
if $DO_BACKEND && [ -n "${ADMIN_PASSWORD:-}" ]; then
|
||||
log "Verifying backend..."
|
||||
sleep 3
|
||||
curl -sf "https://${VPS_HOST}/api/health" -H "X-Admin-Password: $ADMIN_PASSWORD" > /dev/null 2>&1 \
|
||||
&& ok "Backend health check passed" \
|
||||
|| log "Backend health check skipped (might need a moment)"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo "✓ Deploy complete"
|
||||
echo "=== Deploy complete ==="
|
||||
|
||||
Reference in New Issue
Block a user