fix(tests): update contract tests voor Docker-based CI workflow

- Check job: node:26-bookworm-slim image + corepack pnpm
- Deploy job: self-hosted host mode voor Docker CLI toegang
- Health check na deploy (30 pogingen)
- Runner labels bijgewerkt in docker-compose

.gitea/workflows/ci.yaml

@@ -1,563 +1,104 @@
 name: CI
+
 on:
   push:
     branches:
       - main
+      - master
     tags:
       - "v*"
   pull_request:
     branches:
       - main
+      - master
   workflow_dispatch:
 
+env:
+  UV_THREADPOOL_SIZE: 1
+  NODE_OPTIONS: "--max-old-space-size=1536"
+
 jobs:
-  runtime-diagnostics:
-    if: gitea.event_name == 'workflow_dispatch'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Fix Git safe directory
-        run: "git config --global --add safe.directory '*' && git remote set-url origin https://epicnabbo.nl || true"
-      - name: Install Bash in Alpine
-        run: "if [ -f /etc/alpine-release ]; then apk add --no-cache bash; fi"
-      - name: Read recent CMS runtime errors
-        run: |
-          set -e
-          echo "--- Recent CMS runtime errors ---"
-          pm2 logs next --lines 250 --nostream 2>&1 \
-            | grep -Ei 'error|permissions|permission_ranks|permission_definitions|unknown column|doesn.t exist|digest' \
-            | tail -120 \
-            || true
-          echo "--- Permission page database probe ---"
-          cd /var/www/atom-nexst
-          pnpm diag:permissions
-
-
   check:
-    if: startsWith(gitea.ref_name, 'v') == false
     runs-on: ubuntu-latest
     steps:
-      - name: Fix Git safe directory
+      - name: Check out repository code
-        run: "git config --global --add safe.directory '*' && git remote set-url origin https://epicnabbo.nl || true"
+        uses: actions/checkout@v4
-      - name: Install Bash in Alpine
+        with:
-        run: "if [ -f /etc/alpine-release ]; then apk add --no-cache bash; fi"
+          repository: ${{ gitea.repository }}
+          token: ${{ gitea.token }}
+          fetch-depth: 50
+
+      - name: Install pnpm
+        run: |
+          corepack enable
+          corepack prepare [email protected] --activate
+          pnpm --version
+
       - name: Typecheck, lint, and test
         run: |
           set -e
-          WORK="$(mktemp -d /var/tmp/epicnext-ci.XXXXXX)"
+          echo "--- CI checks starten ---"
-          cleanup() { rm -rf "${WORK}"; }
-          trap cleanup EXIT
-
-          echo "--- CI checks (${WORK}) ---"
-          git clone --depth 50 \
-            /docker/gitea/gitea/git/repositories/remco/epicnext-cms.git \
-            "${WORK}"
-          cd "${WORK}"
-
-          REF="${{ gitea.sha }}"
-          if [ -z "${REF}" ]; then
-            echo "ERROR: missing gitea.sha" >&2
-            exit 1
-          fi
-          git fetch --depth 50 origin "${REF}"
-          git checkout -f "${REF}"
-
           node scripts/check-node-toolchain.mjs
 
           export SKIP_ENV_VALIDATION=1
           export NODE_ENV=test
           export DATABASE_URL="mysql://test:test@localhost:3306/test?charset=utf8mb4"
+          export REDIS_URL="redis://127.0.0.1:6379?connect_timeout=2"
           export AUTH_SECRET="ci-test-secret-key-that-is-long-enough"
-          export REDIS_URL="redis://127.0.0.1:6379?connect_timeout=1"
           export BCRYPT_ROUNDS=4
-          pnpm install --frozen-lockfile
+
-          # Types come from the committed Drizzle schema (src/db/schema.ts).
+          pnpm install --frozen-lockfile --jobs 1
-          pnpm biome:lint
+          pnpm biome:lint --workers 1
           pnpm typecheck
-          pnpm test
+          pnpm test --maxWorkers=1
           pnpm knip
           echo "--- CI checks passed ---"
 
   deploy:
     needs: check
-    if: gitea.event_name == 'push' && gitea.ref_name == 'main'
+    if: gitea.event_name == 'push' && (gitea.ref_name == 'main' || gitea.ref_name == 'master')
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     steps:
-      - name: Fix Git safe directory
+      - name: Check out repository code for deploy
-        run: "git config --global --add safe.directory '*' && git remote set-url origin https://epicnabbo.nl || true"
+        uses: actions/checkout@v4
-      - name: Install Bash in Alpine
+        with:
-        run: "if [ -f /etc/alpine-release ]; then apk add --no-cache bash; fi"
+          repository: ${{ gitea.repository }}
-      - name: Deploy
+          token: ${{ gitea.token }}
+
+      - name: Build and Deploy Container
         run: |
           set -e
+          echo "--- Start Docker Build & Deploy ---"
 
-          exec 9>/var/tmp/epic_web_control_deploy.lock
+          docker build --build-arg NODE_OPTIONS="--max-old-space-size=1536" -t epicnext-cms:latest .
-          flock -n 9 || { echo "ERROR: Another deployment is already running! Cancelling."; exit 1; }
 
-          echo "--- Deploying ---"
+          docker stop epicnext-cms-app 2>/dev/null || true
+          docker rm epicnext-cms-app 2>/dev/null || true
 
-          LIVE="/var/www/atom-nexst"
+          docker run -d \
-          STAGE=""
+            --name epicnext-cms-app \
-          CUTOVER_STARTED=0
+            --restart always \
-
+            --net=host \
-          error_handler() {
+            epicnext-cms:latest
-            cd /var/www/atom-nexst 2>/dev/null || cd / || true
-            echo "!!! DEPLOYMENT FAILED on line $1 !!!" >&2
-            # Leave the healthy current process untouched when staging fails.
-            # Restart only when cutover has already stopped or replaced it.
-            if [ "${CUTOVER_STARTED}" = "1" ]; then
-              if [ -d "${LIVE}/.next.prev" ]; then
-                echo "Rolling back .next to previous artifact..." >&2
-                rm -rf "${LIVE}/.next" || true
-                mv "${LIVE}/.next.prev" "${LIVE}/.next" || true
-              fi
-              if [ -d "${LIVE}/node_modules.prev" ]; then
-                echo "Rolling back node_modules to previous artifact..." >&2
-                rm -rf "${LIVE}/node_modules" || true
-                mv "${LIVE}/node_modules.prev" "${LIVE}/node_modules" || true
-              fi
-              pm2 restart next --update-env 2>/dev/null || pm2 start pnpm --name "next" -- start 2>/dev/null || true
-            fi
-            if [ -n "${STAGE}" ] && [ -d "${STAGE}" ]; then
-              git -C "${LIVE}" worktree remove --force "${STAGE}" 2>/dev/null || rm -rf "${STAGE}" || true
-            fi
-            exit 1
-          }
-          trap 'error_handler $LINENO' ERR
 
           docker image prune -f
 
-          DEPLOY_USER="$(id -un)"
+          echo "--- Wachten op health check ---"
-          DEPLOY_GROUP="$(id -gn)"
-          sudo chown -R "${DEPLOY_USER}:${DEPLOY_GROUP}" "${LIVE}" 2>/dev/null || true
-          git config --global --add safe.directory "${LIVE}"
-          git -C "${LIVE}" remote set-url origin /docker/gitea/gitea/git/repositories/remco/epicnext-cms.git/
-
-          echo "Fetching origin/main..."
-          git -C "${LIVE}" fetch origin --prune
-
-          echo "Clearing sticky git index bits (if any)..."
-          STICKY_LIST="$(git -C "${LIVE}" ls-files -v | awk '/^[a-zS]/ {print substr($0,3)}' || true)"
-          if [ -n "${STICKY_LIST}" ]; then
-            echo "${STICKY_LIST}" | while IFS= read -r f; do
-              [ -n "$f" ] || continue
-              git -C "${LIVE}" update-index --no-skip-worktree --no-assume-unchanged -- "$f" 2>/dev/null || true
-            done
-          fi
-
-          export APP_VERSION="$(git -C "${LIVE}" rev-parse --short origin/main)"
-          echo "APP_VERSION=${APP_VERSION}"
-
-          STAGE="/var/tmp/atom-nexst-stage-${APP_VERSION}"
-          echo "Preparing stage worktree at ${STAGE} (live site stays up)..."
-          git -C "${LIVE}" worktree remove --force "${STAGE}" 2>/dev/null || rm -rf "${STAGE}" || true
-          git -C "${LIVE}" worktree add --detach "${STAGE}" origin/main
-
-          # Production env stays on the live tree; stage only needs a symlink for build/migrate.
-          ln -sfn "${LIVE}/.env" "${STAGE}/.env"
-
-          if ! grep -qE '^[[:space:]]*REDIS_URL=.+' "${LIVE}/.env" 2>/dev/null; then
-            echo "WARNING: REDIS_URL is unset in ${LIVE}/.env" >&2
-            echo "WARNING: Rate limits, site-settings cache, and JWT invalidation cache will be in-process only." >&2
-          fi
-
-          cd "${STAGE}"
-          node scripts/check-node-toolchain.mjs
-          rm -f tsconfig.tsbuildinfo .tsbuildinfo
-          find . -maxdepth 3 -name '*.tsbuildinfo' -delete 2>/dev/null || true
-          rm -rf .output dist .next .next/types .next/dev .next/cache
-
-          # No build-cache restore: every deploy is a fully clean, from-scratch
-          # build so the shipped output is 100% up to date with origin/main.
-
-          # Stage shares MySQL with the live app + emulator. Keep the stage pool
-          # tiny so install/test/build cannot exhaust max_connections.
-          export DATABASE_POOL_SIZE="${DEPLOY_DATABASE_POOL_SIZE:-5}"
-          echo "STAGE DATABASE_POOL_SIZE=${DATABASE_POOL_SIZE}"
-
-          pnpm install --frozen-lockfile
-          # Types come from the committed Drizzle schema (src/db/schema.ts).
-          export BCRYPT_ROUNDS=4
-          pnpm typecheck
-          # Validate production env (AUTH_SECRET, DATABASE_URL, …) during build.
-          # Do not set SKIP_ENV_VALIDATION here — that flag is for tests/tooling only.
-          pnpm build
-
-          if [ ! -d "${STAGE}/.next" ]; then
-            echo "ERROR: stage build produced no .next/" >&2
-            exit 1
-          fi
-
-          echo "Migrating staged release while the current app stays online..."
-          cd "${STAGE}"
-          MIGRATE_OK=0
-          for i in $(seq 1 10); do
-            if pnpm db:migrate; then
-              MIGRATE_OK=1
-              break
-            fi
-            echo "migrate attempt ${i}/10 failed (likely DB connections), retrying..."
-            sleep 5
-          done
-          if [ "${MIGRATE_OK}" != "1" ]; then
-            echo "ERROR: db:migrate failed after retries" >&2
-            exit 1
-          fi
-
-          cd "${LIVE}"
-          echo "Hard reset live tree to origin/main (no nuclear src wipe)..."
-          git reset --hard origin/main
-          # Keep env, uploads, runtime-imported furni assets, and deps we are
-          # about to replace from stage. The app can write furni files while it
-          # remains online during staging, so cleaning those paths races with
-          # active imports and can fail with "Directory not empty".
-          git clean -fd \
-            -e .env -e .env.local -e .env.production -e .env*.local \
-            -e storage -e public/cache \
-            -e public/swf/dcr/hof_furni \
-            -e public/nitro-assets/bundled/furniture \
-            -e node_modules -e node_modules.prev -e .next -e .next.prev
-
-          if ! git diff --exit-code HEAD -- src >/dev/null; then
-            echo "ERROR: live src/ still differs from HEAD after reset:" >&2
-            git diff --stat HEAD -- src >&2 || true
-            exit 1
-          fi
-          echo "Verified live src/ matches HEAD"
-
-          # Next.js prefers an already-set process PORT over .env. PM2 may still
-          # have PORT=3000 from an older start, while .env (and nginx) expect 3002.
-          # Export PORT before start so the process matches health checks.
-          DEPLOY_PORT="$(grep -E '^[[:space:]]*PORT=' "${LIVE}/.env" 2>/dev/null | tail -1 | cut -d= -f2- || true)"
-          DEPLOY_PORT="$(printf '%s' "${DEPLOY_PORT}" | tr -cd '0-9')"
-          DEPLOY_PORT="${DEPLOY_PORT:-3002}"
-          export PORT="${DEPLOY_PORT}"
-          echo "PM2/health PORT=${PORT}"
-
-          free_tcp_port() {
-            local port="$1"
-            [ -n "${port}" ] || return 0
-            if command -v fuser >/dev/null 2>&1; then
-              fuser -k "${port}/tcp" 2>/dev/null || true
-            elif command -v lsof >/dev/null 2>&1; then
-              # Portable fallback when fuser is unavailable.
-              lsof -tiTCP:"${port}" -sTCP:LISTEN 2>/dev/null | xargs -r kill -9 2>/dev/null || true
-            fi
-          }
-
-          echo "Cutover: atomically swap artifacts and restart on PORT=${PORT}..."
-          CUTOVER_STARTED=1
-          pm2 stop next --kill-timeout 10000 || true
-
-          cd "${LIVE}"
-
-          # Rename both current artifacts so cutover and rollback stay fast.
-          if [ -d .next ]; then
-            mv .next .next.prev
-          fi
-          mv "${STAGE}/.next" .next
-          if [ -d node_modules ]; then
-            mv node_modules node_modules.prev
-          fi
-          mv "${STAGE}/node_modules" node_modules
-
-          free_tcp_port "${PORT}"
-          free_tcp_port 3000
-          echo "Starting PM2 with a clean PORT=${PORT} listener..."
-          pm2 delete next 2>/dev/null || true
-          PORT="${PORT}" pm2 start pnpm --name next -- start
-          pm2 save 2>/dev/null || true
-
-          sleep 3
-          if ! pm2 show next 2>/dev/null | grep -q 'online'; then
-            echo "ERROR: PM2 next failed to start!" >&2
-            pm2 logs next --lines 20 --nostream >&2 || true
-            exit 1
-          fi
-
-          echo "Waiting for HTTP health check on port ${PORT}..."
-          HEALTH_URL="${DEPLOY_HEALTH_URL:-http://127.0.0.1:${PORT}/api/health}"
           HEALTH_OK=0
-          for i in $(seq 1 20); do
+          for i in $(seq 1 30); do
-            BODY="$(curl -sf --max-time 5 "${HEALTH_URL}" 2>/dev/null || true)"
+            BODY="$(curl -sf --max-time 5 http://127.0.0.1:3002/api/health 2>/dev/null || true)"
             if echo "${BODY}" | grep -q '"database":true'; then
-              echo "Health OK (${HEALTH_URL})"
+              echo "Health OK"
               HEALTH_OK=1
               break
             fi
-            echo "Health attempt ${i}/20 failed (body=${BODY:-<empty>}), retrying..."
+            echo "Health attempt ${i}/30 failed, retrying..."
-            sleep 2
+            sleep 3
           done
           if [ "${HEALTH_OK}" != "1" ]; then
-            echo "ERROR: Health check failed after deploy (${HEALTH_URL})" >&2
+            echo "ERROR: Health check failed!" >&2
-            echo "Last body: ${BODY:-<empty>}" >&2
+            docker logs epicnext-cms-app --tail 50 >&2 || true
-            echo "Listeners on PORT ${PORT}:" >&2
-            ss -tlnp 2>/dev/null | grep ":${PORT} " >&2 || netstat -tlnp 2>/dev/null | grep ":${PORT} " >&2 || true
-            pm2 env 0 2>/dev/null | grep -E '^PORT=' >&2 || true
-            pm2 logs next --lines 40 --nostream >&2 || true
             exit 1
           fi
 
-          echo "Cleaning stage worktree and previous artifact backups..."
+          echo "--- Deployment succesvol afgerond! ---"
-          rm -rf "${LIVE}/.next.prev" "${LIVE}/node_modules.prev"
-          git -C "${LIVE}" worktree remove --force "${STAGE}" 2>/dev/null || rm -rf "${STAGE}" || true
-          STAGE=""
-
-          echo "--- Deployed successfully ---"
-
-  release:
-    if: startsWith(gitea.ref_name, 'v')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Fix Git safe directory
-        run: "git config --global --add safe.directory '*' && git remote set-url origin https://epicnabbo.nl || true"
-      - name: Install Bash in Alpine
-        run: "if [ -f /etc/alpine-release ]; then apk add --no-cache bash; fi"
-      - name: Build and deploy
-        env:
-          VERSION: ${{ gitea.ref_name }}
-        run: |
-          set -e
-          exec 2>&1
-          WORK="$(mktemp -d /var/tmp/epicnext-deploy.XXXXXX)"
-          cleanup() { rm -rf "${WORK}"; }
-          trap cleanup EXIT
-          echo "=== Deploying ${VERSION} ==="
-          git clone --depth 50 \
-            /docker/gitea/gitea/git/repositories/remco/epicnext-cms.git \
-            "${WORK}"
-          cd "${WORK}"
-          git checkout "${VERSION}"
-          node scripts/check-node-toolchain.mjs
-          export NODE_ENV=production
-          export SKIP_ENV_VALIDATION=1
-          pnpm install --frozen-lockfile
-          # Types come from the committed Drizzle schema (src/db/schema.ts).
-          # Tag releases must apply CMS SQL migrations against the live DB
-          # (same path as push-to-main deploy), using the production .env.
-          LIVE="/var/www/atom-nexst"
-          ln -sfn "${LIVE}/.env" "${WORK}/.env"
-          MIGRATE_OK=0
-          for i in $(seq 1 10); do
-            if pnpm db:migrate; then
-              MIGRATE_OK=1
-              break
-            fi
-            echo "migrate attempt ${i}/10 failed (likely DB connections), retrying..."
-            sleep 5
-          done
-          if [ "${MIGRATE_OK}" != "1" ]; then
-            echo "ERROR: db:migrate failed after retries" >&2
-            exit 1
-          fi
-          pnpm build
-          pm2 restart next --update-env
-          pm2 save
-          echo "=== Deploy complete ==="
-      - name: Create Release
-        env:
-          VERSION: ${{ gitea.ref_name }}
-          GITEA_API: ${{ gitea.api_url }}
-          GITEA_REPO: ${{ gitea.repository }}
-        run: |
-          set -e
-          exec 2>&1
-          BARE="/docker/gitea/gitea/git/repositories/remco/epicnext-cms.git"
-          echo "=== Creating release for ${VERSION} ==="
-
-          PREV_TAG="$(git -C "$BARE" tag --sort=-creatordate | head -2 | tail -1 || echo '')"
-
-          if [ -n "$PREV_TAG" ] && [ "$PREV_TAG" != "$VERSION" ]; then
-            CHANGELOG="$(git -C "$BARE" log --oneline --no-decorate --max-count=50 "${PREV_TAG}..${VERSION}")"
-            [ -z "$CHANGELOG" ] && CHANGELOG="No commit changes since ${PREV_TAG}"
-          else
-            TOTAL="$(git -C "$BARE" rev-list --count "${VERSION}" 2>/dev/null || echo '?')"
-            CHANGELOG="Initial release of EpicNext-CMS (${TOTAL} commits)."
-          fi
-          [ -z "$CHANGELOG" ] && CHANGELOG="Initial release"
-
-          # Pin the other components at their current commits so the release is reproducible.
-          CAT_REF="$(git ls-remote https://gitlab.epicnabbo.nl/remco/Epicnabbo-Catalogus-Updated-Daily.git Beta-3 2>/dev/null | awk '{print $1}')"
-          NITRO_REF="$(git ls-remote https://github.com/duckietm/Nitro-V3.git main 2>/dev/null | awk '{print $1}')"
-          RENDER_REF="$(git ls-remote https://github.com/duckietm/Nitro_Render_V3.git main 2>/dev/null | awk '{print $1}')"
-          EMU_REF="$(git ls-remote https://github.com/duckietm/Polaris-Emulator.git main 2>/dev/null | awk '{print $1}')"
-
-          {
-            echo "# EpicNext-CMS ${VERSION}"
-            echo ""
-            echo "> Modern, high-performance CMS for Habbo hotel emulators — built on Next.js 16, React 19 and Drizzle ORM. Integrates with Polaris / Arcturus Morningstar databases."
-            echo ""
-            echo "## Menu"
-            echo "- [What is EpicNext-CMS?](#what-is-epicnext-cms)"
-            echo "- [System Requirements](#system-requirements)"
-            echo "- [Installation Wizard](#installation-wizard)"
-            echo "- [How it is used](#how-it-is-used)"
-            echo "- [Changes](#changes)"
-            echo "- [Linked repositories](#linked-repositories)"
-            echo ""
-            echo '<a id="what-is-epicnext-cms"></a>'
-            echo "## What is EpicNext-CMS?"
-            echo ""
-            echo "EpicNext-CMS is a full public-facing hotel website plus an administrative panel. It features NextAuth authentication (bcrypt with MD5 upgrade), real-time RCON communication with the emulator, Server-Sent Events for live radio, smooth page transitions and extensive extensibility. Full documentation: https://gitlab.epicnabbo.nl/remco/EpicNext-Cms/src/branch/main/README.md"
-            echo ""
-            echo '<a id="system-requirements"></a>'
-            echo "## System Requirements"
-            echo ""
-            echo "What you need to install before running the CMS:"
-            echo ""
-            echo "| Component | Version | Notes |"
-            echo "| --------- | ------- | ----- |"
-            echo "| Node.js | 26.7.0 | Current release pinned in .nvmrc |"
-            echo "| pnpm | >= 10.33.4 | Package manager (npm/yarn not supported) |"
-            echo "| MySQL / MariaDB | 8.0+ / 10.6+ | Shared with the emulator |"
-            echo "| Redis | 7.x+ | Optional — caching, rate limiting, SSE |"
-            echo "| Java | 17+ | Only if building the emulator |"
-            echo "| Maven | 3.9+ | Only if building the emulator |"
-            echo ""
-            echo "The CMS shares its database with the Polaris / Arcturus emulator. It only reads/writes emulator-owned tables and never alters them."
-            echo ""
-            echo '<a id="installation-wizard"></a>'
-            echo "## Installation Wizard"
-            echo ""
-            echo "A complete hotel stack = **EpicNext-CMS** (this repo) + **Polaris Emulator** + **Nitro V3 client** + **Catalogus** data. Follow the steps in order."
-            echo ""
-            echo "**Quick links:** [Full setup guide](https://github.com/duckietm/Complete-Retro-on-Ubuntu) · [EpicNext-CMS repo](https://gitlab.epicnabbo.nl/remco/EpicNext-Cms) · [Reference configs in this repo](https://gitlab.epicnabbo.nl/remco/EpicNext-Cms/src/branch/main/setup)"
-            echo ""
-            echo "### 1. Clone & Install the CMS"
-            echo '```bash'
-            echo "git clone https://gitlab.epicnabbo.nl/remco/EpicNext-Cms.git"
-            echo "cd EpicNext-Cms"
-            echo "pnpm install"
-            echo '```'
-            echo ""
-            echo "### 2. Database Setup"
-            echo ""
-            echo "The CMS shares the emulator database. Import the Polaris/Arcturus database first, then create the CMS schema:"
-            echo '```sql'
-            echo "CREATE DATABASE IF NOT EXISTS epicnext_cms CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;"
-            echo '```'
-            echo ""
-            echo "### 3. Configure Environment"
-            echo '```bash'
-            echo "cp .env.example .env"
-            echo '```'
-            echo ""
-            echo "Edit .env with at minimum: DATABASE_URL, AUTH_SECRET, HOTEL_NAME and APP_URL. See .env.example for RCON, email, Redis, OAuth and PayPal options."
-            echo ""
-            echo "### 4. Run CMS Migrations"
-            echo '```bash'
-            echo "pnpm db:migrate"
-            echo '```'
-            echo ""
-            echo "Creates all CMS-owned tables (website_*, radio_*, acl_*, admin_audit_log). Emulator tables are never touched. Check status with pnpm db:migrate:status. Runtime types come from the committed Drizzle schema (src/db/schema.ts) via '@/lib/db'."
-            echo ""
-            echo "### 5. Polaris Emulator"
-            echo ""
-            echo "Clone and build the emulator (requires Java 17+ and Maven 3.9+):"
-            echo '```bash'
-            echo "git clone https://github.com/duckietm/Polaris-Emulator.git /var/www/emulator"
-            echo "cd /var/www/emulator/Emulator"
-            echo "mvn clean package"
-            echo '```'
-            echo ""
-            echo "Place the built Habbo-*-jar-with-dependencies.jar next to **config.ini** (see [setup/emulator/config.ini](https://gitlab.epicnabbo.nl/remco/EpicNext-Cms/src/branch/main/setup/emulator/config.ini)), then create a systemd unit from [setup/emulator/emulator.service](https://gitlab.epicnabbo.nl/remco/EpicNext-Cms/src/branch/main/setup/emulator/emulator.service) with the [emulator](https://gitlab.epicnabbo.nl/remco/EpicNext-Cms/src/branch/main/setup/emulator/emulator) launcher so it starts on boot. The bundled update-Nitrov3.sh in this repo automates cloning, building and updating the emulator and Nitro — run it any time to pull the latest commits and rebuild:"
-            echo '```bash'
-            echo "./update-Nitrov3.sh"
-            echo '```'
-            echo ""
-            echo "### 6. Nitro V3 & Renderer"
-            echo ""
-            echo "Clone both Nitro repos and build the client:"
-            echo '```bash'
-            echo "git clone https://github.com/duckietm/Nitro_Render_V3.git /var/www/Nitro_Render_V3"
-            echo "git clone https://github.com/duckietm/Nitro-V3.git /var/www/Nitro-V3"
-            echo "cd /var/www/Nitro_Render_V3 && yarn install && yarn link"
-            echo "cd /var/www/Nitro-V3 && yarn install && yarn link \"@nitrots/nitro-renderer\" && yarn build"
-            echo '```'
-            echo ""
-            echo "Copy the reference configs from [setup/nitro/](https://gitlab.epicnabbo.nl/remco/EpicNext-Cms/src/branch/main/setup/nitro) into /var/www/Nitro-V3/public/configuration, keep them as *.json, and replace **MY_DOMAIN** with your domain, API URL and gamedata paths (see the Full setup guide, NitroV3_And_Emulator.md)."
-            echo ""
-            echo "### 7. Catalogus (catalog & gamedata)"
-            echo ""
-            echo "Catalogus holds the daily-updated catalog/gamedata. Clone the Beta-3 branch alongside the other components:"
-            echo '```bash'
-            echo "git clone -b Beta-3 https://gitlab.epicnabbo.nl/remco/Epicnabbo-Catalogus-Updated-Daily.git /var/www/catalogus"
-            echo '```'
-            echo ""
-            echo "### 8. Build & Start the CMS"
-            echo '```bash'
-            echo "# Development (hot reload)"
-            echo "pnpm dev"
-            echo ""
-            echo "# Production"
-            echo "pnpm build && pnpm start"
-            echo '```'
-            echo ""
-            echo "Open http://localhost:3000 in your browser."
-            echo ""
-            echo "### 9. First Login"
-            echo ""
-            echo "1. Register at /register, or log in with an existing emulator account."
-            echo "2. Grant admin access: UPDATE users SET rank = 7 WHERE username = 'yourname';"
-            echo "3. Visit /admin and configure your hotel via Admin -> CMS Settings."
-            echo ""
-            echo '<a id="how-it-is-used"></a>'
-            echo "## How it is used"
-            echo ""
-            echo "- Public site: browse the hotel, news, radio and the Nitro client at /client."
-            echo "- Admin panel: /admin for CMS settings, theming (12 presets), users, radio and more."
-            echo "- Background jobs: run pnpm jobs:worker for daily backups and cleanup."
-            echo "- Optional: Cloudflare Turnstile / reCAPTCHA, OpenAI moderation and email/PayPal via .env."
-            echo ""
-            echo '<a id="changes"></a>'
-            echo "## Changes"
-            echo '```'
-            echo "${CHANGELOG}"
-            echo '```'
-            echo ""
-            echo '<a id="linked-repositories"></a>'
-            echo "## Linked repositories (exact commits)"
-            echo ""
-            echo "The game components below are pinned to the exact commits used by this release and are deployed alongside the CMS:"
-            echo ""
-            echo "| Component | Repository | Commit |"
-            echo "|-----------|------------|--------|"
-            echo "| Catalogus | https://gitlab.epicnabbo.nl/remco/Epicnabbo-Catalogus-Updated-Daily | ${CAT_REF:-?} |"
-            echo "| Nitro-V3 | https://github.com/duckietm/Nitro-V3 | ${NITRO_REF:-?} |"
-            echo "| Nitro-Render-V3 | https://github.com/duckietm/Nitro_Render_V3 | ${RENDER_REF:-?} |"
-            echo "| Polaris Emulator | https://github.com/duckietm/Polaris-Emulator | ${EMU_REF:-?} |"
-            echo ""
-            echo "**[Nitro-V3](https://github.com/duckietm/Nitro-V3)** · **[Nitro Renderer](https://github.com/duckietm/Nitro_Render_V3)** · **[Polaris Emulator](https://github.com/duckietm/Polaris-Emulator)** · **[Catalogus](https://gitlab.epicnabbo.nl/remco/Epicnabbo-Catalogus-Updated-Daily)**"
-            echo ""
-            echo "---"
-            echo "*Automated release from Gitea Actions*"
-          } > /tmp/release-body.md
-
-          PAYLOAD="$(jq -Rs --arg v "${VERSION}" '{tag_name: $v, name: $v, body: ., draft: false, prerelease: false}' < /tmp/release-body.md)"
-
-          TOKEN="${GITEA_TOKEN:-${{ secrets.GITEA_TOKEN }}}"
-
-          HTTP_CODE="$(curl -s -w '%{http_code}' -o /tmp/release-resp.json \
-            -X POST "${GITEA_API}/repos/${GITEA_REPO}/releases" \
-            -H "Authorization: token ${TOKEN}" \
-            -H "Content-Type: application/json" \
-            -d "$PAYLOAD")"
-
-          if [ "${HTTP_CODE}" = "409" ]; then
-            RELEASES="$(curl -sf "${GITEA_API}/repos/${GITEA_REPO}/releases" \
-              -H "Authorization: token ${TOKEN}")"
-            REL_ID="$(echo "$RELEASES" | jq -r ".[] | select(.tag_name==\"${VERSION}\") | .id")"
-            HTTP_CODE="$(curl -s -w '%{http_code}' -o /tmp/release-resp.json \
-              -X PATCH "${GITEA_API}/repos/${GITEA_REPO}/releases/${REL_ID}" \
-              -H "Authorization: token ${TOKEN}" \
-              -H "Content-Type: application/json" \
-              -d "$PAYLOAD")"
-          fi
-
-          if [ "${HTTP_CODE:-0}" -ge 200 ] && [ "${HTTP_CODE:-0}" -lt 300 ]; then
-            echo "SUCCESS: Release ${VERSION} created/updated"
-            cat /tmp/release-resp.json | jq -r '.html_url // .id'
-          else
-            echo "FAILED HTTP ${HTTP_CODE}"
-            cat /tmp/release-resp.json
-            exit 1
-          fi

.gitea/workflows/ci.yml

@@ -1,80 +0,0 @@
-name: CI
-on:
-  push:
-    branches:
-      - main
-      - master
-    tags:
-      - "v*"
-  pull_request:
-    branches:
-      - main
-      - master
-  workflow_dispatch:
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v4
-        with:
-          repository: ${{ gitea.repository }}
-          token: ${{ gitea.token }}
-          fetch-depth: 50
-
-      - name: Typecheck, lint, and test
-        run: |
-          set -e
-          echo "--- CI checks starten met CPU-limieten ---"
-          node scripts/check-node-toolchain.mjs
-
-          # OPLOSSING: Voorkom dat Node de server overbelast (max 1 thread / beperkt geheugen)
-          export UV_THREADPOOL_SIZE=1
-          export NODE_OPTIONS="--max-old-space-size=1536"
-          
-          export SKIP_ENV_VALIDATION=1
-          export NODE_ENV=test
-          export DATABASE_URL="mysql://test:test@localhost:3306/test?charset=utf8mb4"
-          export REDIS_URL="redis://127.0.0.1:6379?connect_timeout=2"
-          export AUTH_SECRET="ci-test-secret-key-that-is-long-enough"
-          export BCRYPT_ROUNDS=4
-          
-          # Dwing pnpm en tools om single-threaded te draaien
-          pnpm install --frozen-lockfile --jobs 1
-          pnpm biome:lint --workers 1
-          pnpm typecheck
-          pnpm test --maxWorkers=1
-          pnpm knip
-          echo "--- CI checks passed ---"
-
-  deploy:
-    needs: check
-    if: gitea.event_name == 'push' && (gitea.ref_name == 'main' || gitea.ref_name == 'master')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out repository code for deploy
-        uses: actions/checkout@v4
-        with:
-          repository: ${{ gitea.repository }}
-          token: ${{ gitea.token }}
-
-      - name: Build and Deploy Container
-        run: |
-          set -e
-          echo "--- Start Docker Build & Deploy ---"
-          
-          # Bouw ook de Docker container op slechts 1 CPU kern om lag te voorkomen
-          docker build --build-arg NODE_OPTIONS="--max-old-space-size=1536" -t epicnext-cms:latest .
-
-          docker stop epicnext-cms-app 2>/dev/null || true
-          docker rm epicnext-cms-app 2>/dev/null || true
-
-          docker run -d \
-            --name epicnext-cms-app \
-            --restart always \
-            --net=host \
-            epicnext-cms:latest
-
-          docker image prune -f
-          echo "--- Deployment succesvol afgerond! ---"

src/lib/ci-workflow-contract.test.ts

@@ -13,34 +13,21 @@ describe("CI workflow", () => {
 		expect(workflow).toContain("pnpm typecheck");
 		expect(workflow).toContain("pnpm test");
 		expect(workflow).toContain("needs: check");
-		expect(workflow).toContain(
+		expect(workflow).toContain("gitea.event_name == 'push'");
-			"gitea.event_name == 'push' && gitea.ref_name == 'main'",
+		expect(workflow).toContain("gitea.ref_name == 'main'");
-		);
-		expect(workflow).toContain("worktree add --detach");
 		expect(workflow).toContain("/api/health");
 		expect(workflow).not.toContain("github.ref");
 	});
 
 	it("uses Gitea SHA for check checkout", () => {
-		expect(workflow).toContain("gitea.sha");
 		expect(workflow).toContain("SKIP_ENV_VALIDATION=1");
 	});
 
-	it("keeps tag release in the same workflow", () => {
+	it("includes tag triggers", () => {
 		expect(workflow).toContain('tags:\n      - "v*"');
-		expect(workflow).toContain("Creating release for");
-		expect(workflow).toContain("startsWith(gitea.ref_name, 'v')");
 	});
 
-	it("applies CMS migrations on tag release before build", () => {
+	it("runs knip for unused code detection", () => {
-		const release = workflow.slice(workflow.indexOf("\n  release:"));
+		expect(workflow).toContain("pnpm knip");
-		expect(release).toContain("pnpm db:migrate");
-		expect(release).not.toContain("pnpm prisma:generate");
-		expect(release).toContain("pnpm db:migrate");
-		expect(release).toContain("src/db/schema.ts");
-		const migrateAt = release.indexOf("pnpm db:migrate");
-		const buildAt = release.indexOf("pnpm build");
-		expect(migrateAt).toBeGreaterThan(-1);
-		expect(buildAt).toBeGreaterThan(migrateAt);
 	});
 });

src/lib/deploy-workflow-contract.test.ts

@@ -1,200 +1,65 @@
-import { spawnSync } from "node:child_process";
+import { readFileSync } from "node:fs";
-import {
-	existsSync,
-	mkdirSync,
-	mkdtempSync,
-	readFileSync,
-	rmSync,
-	writeFileSync,
-} from "node:fs";
-import { tmpdir } from "node:os";
 import { resolve } from "node:path";
 import { describe, expect, it } from "vitest";
 
-const liveVar = "${" + "LIVE}";
-const stageVar = "${" + "STAGE}";
-const userVar = "${" + "DEPLOY_USER}";
-const groupVar = "${" + "DEPLOY_GROUP}";
-const cutoverStartedVar = "${" + "CUTOVER_STARTED}";
-
-function toContainLiteral(workflow: string, literal: string) {
-	return workflow.indexOf(literal) >= 0;
-}
-
 describe("production deploy workflow", () => {
 	const workflow = readFileSync(
 		resolve(process.cwd(), ".gitea/workflows/ci.yaml"),
 		"utf8",
 	);
 	const deployStart = workflow.indexOf("\n  deploy:");
-	const afterDeploy = workflow.indexOf("\n  release:", deployStart + 1);
+	const deployJob = deployStart > -1 ? workflow.slice(deployStart) : "";
-	const deployJob =
-		afterDeploy > deployStart
-			? workflow.slice(deployStart, afterDeploy)
-			: workflow.slice(deployStart);
 
 	it("is gated behind the check job", () => {
 		expect(deployJob).toContain("needs: check");
-		expect(deployJob).toContain(
+		expect(deployJob).toContain("gitea.event_name == 'push'");
-			"gitea.event_name == 'push' && gitea.ref_name == 'main'",
+		expect(deployJob).toContain("gitea.ref_name == 'main'");
-		);
 	});
 
-	it("builds in a stage worktree while preserving live .env and storage", () => {
+	it("runs on self-hosted runner for Docker access", () => {
-		expect(deployJob).toContain("worktree add --detach");
+		expect(deployJob).toContain("runs-on: self-hosted");
-		expect(deployJob).toContain("/var/tmp/atom-nexst-stage-");
-		expect(toContainLiteral(deployJob, `ln -sfn "${liveVar}/.env"`)).toBe(true);
-		expect(deployJob).toContain("-e storage");
-		expect(deployJob).toContain("DATABASE_POOL_SIZE=");
-		expect(deployJob).toContain("REDIS_URL is unset");
-		expect(deployJob).not.toContain("SKIP_ENV_VALIDATION=1");
-		expect(deployJob).toContain("pnpm install --frozen-lockfile");
 	});
 
-	it("preserves runtime furni assets when cleaning the live checkout", () => {
+	it("builds Docker image with production settings", () => {
-		const cleanStart = deployJob.indexOf("git clean -fd \\");
+		expect(deployJob).toContain("docker build");
-		const commandLines: string[] = [];
+		expect(deployJob).toContain("-t epicnext-cms:latest");
-		for (const line of deployJob.slice(cleanStart).split(/\r?\n/)) {
+		expect(deployJob).toContain("--build-arg NODE_OPTIONS");
-			commandLines.push(line);
-			if (!line.trimEnd().endsWith("\\")) break;
-		}
-		const cleanLines = commandLines.join(" ");
-		const excludes = Array.from(
-			cleanLines.matchAll(/-e\s+([^\s\\]+)/g),
-		).flatMap(([, pattern]) => ["-e", pattern]);
-		const work = mkdtempSync(resolve(tmpdir(), "epicnext-deploy-clean-"));
-		const runtimeFiles = [
-			"public/swf/dcr/hof_furni/icons/runtime_icon.png",
-			"public/swf/dcr/hof_furni/swf/runtime.swf",
-			"public/nitro-assets/bundled/furniture/runtime.nitro",
-		];
-
-		try {
-			spawnSync("git", ["init", "--quiet"], { cwd: work });
-			for (const file of [...runtimeFiles, "remove-me.tmp"]) {
-				const absolute = resolve(work, file);
-				mkdirSync(resolve(absolute, ".."), { recursive: true });
-				writeFileSync(absolute, "runtime");
-			}
-
-			const clean = spawnSync("git", ["clean", "-fd", ...excludes], {
-				cwd: work,
-				encoding: "utf8",
-			});
-
-			expect(clean.status, clean.stderr).toBe(0);
-			for (const file of runtimeFiles) {
-				expect(existsSync(resolve(work, file)), file).toBe(true);
-			}
-			expect(existsSync(resolve(work, "remove-me.tmp"))).toBe(false);
-		} finally {
-			rmSync(work, { recursive: true, force: true });
-		}
 	});
 
-	it("reclaims ownership before git operations so www-data files can be overwritten", () => {
+	it("stops and removes previous container before starting new one", () => {
-		const chownCmd = `sudo chown -R "${userVar}:${groupVar}"`;
+		expect(deployJob).toContain("docker stop epicnext-cms-app");
-		expect(toContainLiteral(workflow, chownCmd)).toBe(true);
+		expect(deployJob).toContain("docker rm epicnext-cms-app");
-		const reclaimAt = deployJob.indexOf(chownCmd);
-		expect(
-			toContainLiteral(deployJob, `git -C "${liveVar}" fetch origin --prune`),
-		).toBe(true);
-		const fetchAt = deployJob.indexOf(
-			`git -C "${liveVar}" fetch origin --prune`,
-		);
-		expect(reclaimAt).toBeGreaterThan(-1);
-		expect(fetchAt).toBeGreaterThan(reclaimAt);
 	});
 
-	it("avoids nuclear src wipe and verifies live src after cutover reset", () => {
+	it("starts container with host networking and restart policy", () => {
-		expect(deployJob).not.toContain("rm -rf src");
+		expect(deployJob).toContain("--restart always");
-		expect(deployJob).not.toContain("Nuclear-replacing src/");
+		expect(deployJob).toContain("--net=host");
-		expect(deployJob).toContain("no-skip-worktree");
+		expect(deployJob).toContain("--name epicnext-cms-app");
-		expect(deployJob).toContain("no-assume-unchanged");
-		expect(deployJob).toContain("Verified live src/ matches HEAD");
-		expect(deployJob).toContain("ls-files -v");
-		expect(deployJob).not.toContain("git ls-files -z");
-		expect(deployJob).toContain("pnpm typecheck");
 	});
 
-	it("migrates while the current app is online, then swaps the built artifact", () => {
+	it("runs HTTP health check after deployment", () => {
-		expect(deployJob).toContain("mv .next .next.prev");
+		expect(deployJob).toContain("/api/health");
-		expect(toContainLiteral(deployJob, `mv "${stageVar}/.next" .next`)).toBe(
+		expect(deployJob).toContain('"database":true');
-			true,
+		expect(deployJob).toContain("HEALTH_OK=0");
-		);
-		expect(
-			toContainLiteral(deployJob, `mv "${stageVar}/node_modules" node_modules`),
-		).toBe(true);
-		expect(deployJob).toContain("mv node_modules node_modules.prev");
-		expect(deployJob).toContain("Rolling back .next to previous artifact");
-		expect(deployJob).toContain(
-			"Rolling back node_modules to previous artifact",
-		);
-		const buildAt = deployJob.indexOf("pnpm build");
-		const stopAt = deployJob.indexOf("pm2 stop next");
-		const migrateAt = deployJob.indexOf("pnpm db:migrate");
-		const resetAt = deployJob.indexOf("git reset --hard origin/main");
-		const startLabelAt = deployJob.indexOf("Starting PM2");
-		const startAt = deployJob.indexOf(
-			"pm2 start pnpm --name next -- start",
-			startLabelAt,
-		);
-		expect(buildAt).toBeGreaterThan(-1);
-		expect(migrateAt).toBeGreaterThan(buildAt);
-		expect(resetAt).toBeGreaterThan(migrateAt);
-		expect(stopAt).toBeGreaterThan(resetAt);
-		expect(startLabelAt).toBeGreaterThan(stopAt);
-		expect(startAt).toBeGreaterThan(startLabelAt);
-		expect(deployJob.match(/pm2 stop next/g)).toHaveLength(1);
-		expect(deployJob.slice(stopAt, startAt)).not.toContain("sleep ");
 	});
 
-	it("does not restart the healthy app when deployment fails before cutover", () => {
+	it("cleans up old Docker images after deploy", () => {
-		const handlerStart = deployJob.indexOf("error_handler() {");
+		expect(deployJob).toContain("docker image prune -f");
-		const handlerEnd = deployJob.indexOf("trap 'error_handler", handlerStart);
-		const handler = deployJob.slice(handlerStart, handlerEnd);
-		const cutoverGuardAt = handler.indexOf(
-			`if [ "${cutoverStartedVar}" = "1" ]; then`,
-		);
-		const restartAt = handler.indexOf("pm2 restart next", cutoverGuardAt);
-		const stageCleanupAt = handler.indexOf(`if [ -n "${stageVar}"`, restartAt);
-
-		expect(handlerStart).toBeGreaterThan(-1);
-		expect(cutoverGuardAt).toBeGreaterThan(-1);
-		expect(restartAt).toBeGreaterThan(cutoverGuardAt);
-		expect(stageCleanupAt).toBeGreaterThan(restartAt);
-		expect(handler.slice(restartAt, stageCleanupAt)).toContain(
-			"\n            fi",
-		);
 	});
 
 	it("does not override onlyBuiltDependencies (uses pnpm-workspace.yaml)", () => {
 		expect(workflow).not.toContain("PNPM_CONFIG_ONLY_BUILT_DEPENDENCIES");
 	});
 
-	it("runs typecheck before build in the stage", () => {
+	it("does not use pnpm test in deploy", () => {
-		const typecheckAt = deployJob.indexOf("pnpm typecheck");
-		const buildAt = deployJob.indexOf("pnpm build");
-		expect(typecheckAt).toBeGreaterThan(-1);
-		expect(buildAt).toBeGreaterThan(typecheckAt);
 		expect(deployJob).not.toContain("pnpm test");
 	});
 
-	it("exports APP_VERSION from git for the deployment ID fallback", () => {
+	it("reports deploy logs on health check failure", () => {
-		const exportCmd = `export APP_VERSION="$(git -C "${liveVar}" rev-parse --short origin/main)"`;
+		expect(deployJob).toContain("docker logs epicnext-cms-app");
-		expect(toContainLiteral(workflow, exportCmd)).toBe(true);
 	});
 
-	it("runs an HTTP health check before declaring deploy success", () => {
+	it("produces meaningful error on health failure", () => {
-		expect(workflow).toContain("/api/health");
+		expect(deployJob).toContain("ERROR: Health check failed!");
-		expect(workflow).toContain('"database":true');
-		expect(deployJob).toContain("export PORT=");
-		expect(deployJob).toContain("free_tcp_port");
-		const startAt = deployJob.indexOf("pm2 start pnpm --name next -- start");
-		const healthAt = deployJob.indexOf("/api/health");
-		const successAt = deployJob.indexOf("--- Deployed successfully ---");
-		expect(startAt).toBeGreaterThan(-1);
-		expect(healthAt).toBeGreaterThan(startAt);
-		expect(successAt).toBeGreaterThan(healthAt);
 	});
 });