diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 8b0d9e323..1f2fc99b3 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -4,8 +4,6 @@ on:
push:
branches:
- main
- tags:
- - 'v*'
env:
REGISTRY: ghcr.io
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ee56e460e..ad36a3181 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,6 +7,13 @@ on:
permissions:
contents: write
+ packages: write
+ attestations: write
+ id-token: write
+
+env:
+ REGISTRY: ghcr.io
+ IMAGE_NAME: ${{ github.repository }}
jobs:
build:
@@ -56,9 +63,49 @@ jobs:
path: erupe-${{ matrix.os_name }}.zip
retention-days: 1
+ docker:
+ name: Build and Push Docker Image
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+
+ - name: Log in to the Container registry
+ uses: docker/login-action@v3
+ with:
+ registry: ${{ env.REGISTRY }}
+ username: ${{ github.actor }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Extract metadata (tags, labels) for Docker
+ id: meta
+ uses: docker/metadata-action@v5
+ with:
+ images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+ tags: |
+ type=semver,pattern={{version}}
+ type=semver,pattern={{major}}.{{minor}}
+
+ - name: Build and push Docker image
+ id: push
+ uses: docker/build-push-action@v6
+ with:
+ context: .
+ push: true
+ tags: ${{ steps.meta.outputs.tags }}
+ labels: ${{ steps.meta.outputs.labels }}
+
+ - name: Generate artifact attestation
+ uses: actions/attest-build-provenance@v2
+ with:
+ subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+ subject-digest: ${{ steps.push.outputs.digest }}
+ push-to-registry: true
+
release:
name: Create Release
- needs: build
+ needs: [build, docker]
runs-on: ubuntu-latest
steps:
@@ -76,6 +123,15 @@ jobs:
uses: softprops/action-gh-release@v2
with:
generate_release_notes: true
+ body: |
+ ## Docker Image
+
+ This release is also available as a Docker image:
+
+ ```bash
+ docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
+ ```
+ append_body: true
files: |
artifacts/Linux-amd64/erupe-Linux-amd64.zip
artifacts/Windows-amd64/erupe-Windows-amd64.zip
diff --git a/common/db/adapter.go b/common/db/adapter.go
new file mode 100644
index 000000000..de71b85bf
--- /dev/null
+++ b/common/db/adapter.go
@@ -0,0 +1,68 @@
+// Package db provides a database adapter that transparently translates
+// PostgreSQL-style SQL to the active driver's dialect.
+//
+// When the driver is "sqlite", queries are rewritten on the fly:
+// - $1, $2, ... → ?, ?, ...
+// - now() → CURRENT_TIMESTAMP
+// - ::type casts → removed
+// - ILIKE → LIKE (SQLite LIKE is case-insensitive for ASCII)
+package db
+
+import (
+ "regexp"
+ "strings"
+
+ "github.com/jmoiron/sqlx"
+)
+
+// IsSQLite reports whether the given sqlx.DB is backed by a SQLite driver.
+func IsSQLite(db *sqlx.DB) bool {
+ return db.DriverName() == "sqlite" || db.DriverName() == "sqlite3"
+}
+
+// Adapt rewrites a PostgreSQL query for the active driver.
+// For Postgres it's a no-op. For SQLite it translates placeholders and
+// Postgres-specific syntax.
+func Adapt(db *sqlx.DB, query string) string {
+ if !IsSQLite(db) {
+ return query
+ }
+ return AdaptSQL(query)
+}
+
+// castRe matches Postgres type casts like ::int, ::text, ::timestamptz,
+// ::character varying, etc.
+// castRe matches Postgres type casts: ::int, ::text, ::timestamptz,
+// ::character varying(N), etc. The space is allowed only when followed
+// by a word char (e.g. "character varying") to avoid eating trailing spaces.
+var castRe = regexp.MustCompile(`::[a-zA-Z_]\w*(?:\s+\w+)*(?:\([^)]*\))?`)
+
+// dollarParamRe matches Postgres-style positional parameters: $1, $2, etc.
+var dollarParamRe = regexp.MustCompile(`\$\d+`)
+
+// AdaptSQL translates a PostgreSQL query to SQLite-compatible SQL.
+// Exported so it can be tested without a real DB connection.
+func AdaptSQL(query string) string {
+ // 1. Replace now() with CURRENT_TIMESTAMP
+ query = strings.ReplaceAll(query, "now()", "CURRENT_TIMESTAMP")
+ query = strings.ReplaceAll(query, "NOW()", "CURRENT_TIMESTAMP")
+
+ // 2. Strip Postgres type casts (::int, ::text, ::timestamptz, etc.)
+ query = castRe.ReplaceAllString(query, "")
+
+ // 3. ILIKE → LIKE (SQLite LIKE is case-insensitive for ASCII by default)
+ query = strings.ReplaceAll(query, " ILIKE ", " LIKE ")
+ query = strings.ReplaceAll(query, " ilike ", " LIKE ")
+
+ // 4. Strip "public." schema prefix (SQLite has no schemas)
+ query = strings.ReplaceAll(query, "public.", "")
+
+ // 5. TRUNCATE → DELETE FROM (SQLite has no TRUNCATE)
+ query = strings.ReplaceAll(query, "TRUNCATE ", "DELETE FROM ")
+ query = strings.ReplaceAll(query, "truncate ", "DELETE FROM ")
+
+ // 6. Replace $1,$2,... → ?,?,...
+ query = dollarParamRe.ReplaceAllString(query, "?")
+
+ return query
+}
diff --git a/common/db/adapter_test.go b/common/db/adapter_test.go
new file mode 100644
index 000000000..08ff6f402
--- /dev/null
+++ b/common/db/adapter_test.go
@@ -0,0 +1,83 @@
+package db
+
+import (
+ "testing"
+)
+
+func TestAdaptSQL(t *testing.T) {
+ tests := []struct {
+ name string
+ input string
+ want string
+ }{
+ {
+ name: "placeholder rebind",
+ input: "SELECT * FROM users WHERE id=$1 AND name=$2",
+ want: "SELECT * FROM users WHERE id=? AND name=?",
+ },
+ {
+ name: "now() replacement",
+ input: "UPDATE characters SET guild_post_checked=now() WHERE id=$1",
+ want: "UPDATE characters SET guild_post_checked=CURRENT_TIMESTAMP WHERE id=?",
+ },
+ {
+ name: "type cast removal",
+ input: "UPDATE users SET frontier_points=frontier_points::int - $1 WHERE id=$2 RETURNING frontier_points",
+ want: "UPDATE users SET frontier_points=frontier_points - ? WHERE id=? RETURNING frontier_points",
+ },
+ {
+ name: "text cast removal",
+ input: "SELECT COALESCE(friends, ''::text) FROM characters WHERE id=$1",
+ want: "SELECT COALESCE(friends, '') FROM characters WHERE id=?",
+ },
+ {
+ name: "timestamptz cast removal",
+ input: "SELECT COALESCE(created_at, '2000-01-01'::timestamptz) FROM guilds WHERE id=$1",
+ want: "SELECT COALESCE(created_at, '2000-01-01') FROM guilds WHERE id=?",
+ },
+ {
+ name: "ILIKE to LIKE",
+ input: "SELECT * FROM characters WHERE name ILIKE $1",
+ want: "SELECT * FROM characters WHERE name LIKE ?",
+ },
+ {
+ name: "character varying cast",
+ input: "DEFAULT ''::character varying",
+ want: "DEFAULT ''",
+ },
+ {
+ name: "no changes for standard SQL",
+ input: "SELECT COUNT(*) FROM users",
+ want: "SELECT COUNT(*) FROM users",
+ },
+ {
+ name: "NOW uppercase",
+ input: "INSERT INTO events (start_time) VALUES (NOW())",
+ want: "INSERT INTO events (start_time) VALUES (CURRENT_TIMESTAMP)",
+ },
+ {
+ name: "multi-digit params",
+ input: "INSERT INTO t (a,b,c) VALUES ($1,$2,$10)",
+ want: "INSERT INTO t (a,b,c) VALUES (?,?,?)",
+ },
+ {
+ name: "public schema prefix",
+ input: "INSERT INTO public.distributions_accepted VALUES ($1, $2)",
+ want: "INSERT INTO distributions_accepted VALUES (?, ?)",
+ },
+ {
+ name: "TRUNCATE to DELETE FROM",
+ input: "TRUNCATE public.cafebonus;",
+ want: "DELETE FROM cafebonus;",
+ },
+ }
+
+ for _, tc := range tests {
+ t.Run(tc.name, func(t *testing.T) {
+ got := AdaptSQL(tc.input)
+ if got != tc.want {
+ t.Errorf("\ngot: %s\nwant: %s", got, tc.want)
+ }
+ })
+ }
+}
diff --git a/common/db/db.go b/common/db/db.go
new file mode 100644
index 000000000..0a5171d30
--- /dev/null
+++ b/common/db/db.go
@@ -0,0 +1,149 @@
+// Package db provides a transparent database wrapper that rewrites
+// PostgreSQL-style SQL for SQLite when needed.
+package db
+
+import (
+ "context"
+ "database/sql"
+
+ "github.com/jmoiron/sqlx"
+)
+
+// DB wraps *sqlx.DB and transparently adapts PostgreSQL queries for SQLite.
+// For PostgreSQL, all methods are simple pass-throughs with zero overhead.
+type DB struct {
+ *sqlx.DB
+ sqlite bool
+}
+
+// Wrap creates a DB wrapper around an existing *sqlx.DB connection.
+// Returns nil if db is nil.
+func Wrap(db *sqlx.DB) *DB {
+ if db == nil {
+ return nil
+ }
+ return &DB{
+ DB: db,
+ sqlite: IsSQLite(db),
+ }
+}
+
+func (d *DB) adapt(query string) string {
+ if !d.sqlite {
+ return query
+ }
+ return AdaptSQL(query)
+}
+
+// Exec executes a query without returning any rows.
+func (d *DB) Exec(query string, args ...interface{}) (sql.Result, error) {
+ return d.DB.Exec(d.adapt(query), args...)
+}
+
+// ExecContext executes a query without returning any rows.
+func (d *DB) ExecContext(ctx context.Context, query string, args ...interface{}) (sql.Result, error) {
+ return d.DB.ExecContext(ctx, d.adapt(query), args...)
+}
+
+// Query executes a query that returns rows.
+func (d *DB) Query(query string, args ...interface{}) (*sql.Rows, error) {
+ return d.DB.Query(d.adapt(query), args...)
+}
+
+// QueryContext executes a query that returns rows.
+func (d *DB) QueryContext(ctx context.Context, query string, args ...interface{}) (*sql.Rows, error) {
+ return d.DB.QueryContext(ctx, d.adapt(query), args...)
+}
+
+// QueryRow executes a query that is expected to return at most one row.
+func (d *DB) QueryRow(query string, args ...interface{}) *sql.Row {
+ return d.DB.QueryRow(d.adapt(query), args...)
+}
+
+// QueryRowContext executes a query that is expected to return at most one row.
+func (d *DB) QueryRowContext(ctx context.Context, query string, args ...interface{}) *sql.Row {
+ return d.DB.QueryRowContext(ctx, d.adapt(query), args...)
+}
+
+// Get queries a single row and scans it into dest.
+func (d *DB) Get(dest interface{}, query string, args ...interface{}) error {
+ return d.DB.Get(dest, d.adapt(query), args...)
+}
+
+// Select queries multiple rows and scans them into dest.
+func (d *DB) Select(dest interface{}, query string, args ...interface{}) error {
+ return d.DB.Select(dest, d.adapt(query), args...)
+}
+
+// Queryx executes a query that returns sqlx.Rows.
+func (d *DB) Queryx(query string, args ...interface{}) (*sqlx.Rows, error) {
+ return d.DB.Queryx(d.adapt(query), args...)
+}
+
+// QueryRowx executes a query that returns a sqlx.Row.
+func (d *DB) QueryRowx(query string, args ...interface{}) *sqlx.Row {
+ return d.DB.QueryRowx(d.adapt(query), args...)
+}
+
+// QueryRowxContext executes a query that returns a sqlx.Row.
+func (d *DB) QueryRowxContext(ctx context.Context, query string, args ...interface{}) *sqlx.Row {
+ return d.DB.QueryRowxContext(ctx, d.adapt(query), args...)
+}
+
+// BeginTxx starts a new transaction with context and options.
+// The returned Tx wrapper adapts queries the same way as DB.
+func (d *DB) BeginTxx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) {
+ tx, err := d.DB.BeginTxx(ctx, opts)
+ if err != nil {
+ return nil, err
+ }
+ return &Tx{Tx: tx, sqlite: d.sqlite}, nil
+}
+
+// Tx wraps *sqlx.Tx and transparently adapts PostgreSQL queries for SQLite.
+type Tx struct {
+ *sqlx.Tx
+ sqlite bool
+}
+
+func (t *Tx) adapt(query string) string {
+ if !t.sqlite {
+ return query
+ }
+ return AdaptSQL(query)
+}
+
+// Exec executes a query without returning any rows.
+func (t *Tx) Exec(query string, args ...interface{}) (sql.Result, error) {
+ return t.Tx.Exec(t.adapt(query), args...)
+}
+
+// ExecContext executes a query without returning any rows.
+func (t *Tx) ExecContext(ctx context.Context, query string, args ...interface{}) (sql.Result, error) {
+ return t.Tx.ExecContext(ctx, t.adapt(query), args...)
+}
+
+// Query executes a query that returns rows.
+func (t *Tx) Query(query string, args ...interface{}) (*sql.Rows, error) {
+ return t.Tx.Query(t.adapt(query), args...)
+}
+
+// QueryRow executes a query that is expected to return at most one row.
+func (t *Tx) QueryRow(query string, args ...interface{}) *sql.Row {
+ return t.Tx.QueryRow(t.adapt(query), args...)
+}
+
+// Queryx executes a query that returns sqlx.Rows.
+func (t *Tx) Queryx(query string, args ...interface{}) (*sqlx.Rows, error) {
+ return t.Tx.Queryx(t.adapt(query), args...)
+}
+
+// QueryRowx executes a query that returns a sqlx.Row.
+func (t *Tx) QueryRowx(query string, args ...interface{}) *sqlx.Row {
+ return t.Tx.QueryRowx(t.adapt(query), args...)
+}
+
+// Get queries a single row and scans it into dest.
+func (t *Tx) Get(dest interface{}, query string, args ...interface{}) error {
+ return t.Tx.Get(dest, t.adapt(query), args...)
+}
diff --git a/config/config.go b/config/config.go
index 8555fe701..1c558d06c 100644
--- a/config/config.go
+++ b/config/config.go
@@ -231,8 +231,12 @@ type Course struct {
Enabled bool
}
-// Database holds the postgres database config.
+// Database holds the database config.
+// Driver can be "postgres" (default) or "sqlite".
+// When Driver is "sqlite", only Database (file path) is used;
+// Host, Port, User, and Password are ignored.
type Database struct {
+ Driver string // "postgres" or "sqlite"
Host string
Port int
User string
@@ -454,7 +458,8 @@ func registerDefaults() {
{Name: "EXRenewing", Enabled: true},
})
- // Database (Password deliberately has no default)
+ // Database (Password deliberately has no default for postgres)
+ viper.SetDefault("Database.Driver", "postgres")
viper.SetDefault("Database.Host", "localhost")
viper.SetDefault("Database.Port", 5432)
viper.SetDefault("Database.User", "postgres")
diff --git a/go.mod b/go.mod
index b7b834a12..23fa722e1 100644
--- a/go.mod
+++ b/go.mod
@@ -16,13 +16,18 @@ require (
require (
github.com/DATA-DOG/go-sqlmock v1.5.2 // indirect
+ github.com/dustin/go-humanize v1.0.1 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
+ github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
+ github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
+ github.com/ncruces/go-strftime v1.0.0 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
+ github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
github.com/sagikazarmark/locafero v0.3.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
@@ -31,9 +36,13 @@ require (
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
- golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
+ golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 // indirect
golang.org/x/net v0.49.0 // indirect
golang.org/x/sys v0.41.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
+ modernc.org/libc v1.67.6 // indirect
+ modernc.org/mathutil v1.7.1 // indirect
+ modernc.org/memory v1.11.0 // indirect
+ modernc.org/sqlite v1.46.1 // indirect
)
diff --git a/go.sum b/go.sum
index 576eb28df..c58be6bb9 100644
--- a/go.sum
+++ b/go.sum
@@ -54,6 +54,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
+github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -109,6 +111,7 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -124,6 +127,8 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe
github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
@@ -159,10 +164,14 @@ github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg=
github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w=
+github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -171,6 +180,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
+github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
@@ -237,6 +248,8 @@ golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EH
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ=
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE=
+golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 h1:mgKeJMpvi0yx/sU5GsxQ7p6s2wtOnGAHZWCHUM4KGzY=
+golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546/go.mod h1:j/pmGrbnkbPtQfxEe5D0VQhZC6qKbfKifgD0oM7sR70=
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -348,6 +361,7 @@ golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -521,6 +535,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+modernc.org/libc v1.67.6 h1:eVOQvpModVLKOdT+LvBPjdQqfrZq+pC39BygcT+E7OI=
+modernc.org/libc v1.67.6/go.mod h1:JAhxUVlolfYDErnwiqaLvUqc8nfb2r6S6slAgZOnaiE=
+modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
+modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
+modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI=
+modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw=
+modernc.org/sqlite v1.46.1 h1:eFJ2ShBLIEnUWlLy12raN0Z1plqmFX9Qe3rjQTKt6sU=
+modernc.org/sqlite v1.46.1/go.mod h1:CzbrU2lSB1DKUusvwGz7rqEKIq+NUd8GWuBBZDs9/nA=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
diff --git a/main.go b/main.go
index edee6de24..8f764f6a3 100644
--- a/main.go
+++ b/main.go
@@ -25,6 +25,7 @@ import (
"github.com/jmoiron/sqlx"
_ "github.com/lib/pq"
"go.uber.org/zap"
+ _ "modernc.org/sqlite"
)
// Temporary DB auto clean on startup for quick development & testing.
@@ -108,7 +109,7 @@ func main() {
logger.Info(fmt.Sprintf("Starting Erupe (9.3b-%s)", Commit()))
logger.Info(fmt.Sprintf("Client Mode: %s (%d)", config.ClientMode, config.RealClientMode))
- if config.Database.Password == "" {
+ if config.Database.Driver != "sqlite" && config.Database.Password == "" {
preventClose(config, "Database password is blank")
}
@@ -136,19 +137,38 @@ func main() {
logger.Info("Discord: Disabled")
}
- // Create the postgres DB pool.
- connectString := fmt.Sprintf(
- "host='%s' port='%d' user='%s' password='%s' dbname='%s' sslmode=disable",
- config.Database.Host,
- config.Database.Port,
- config.Database.User,
- config.Database.Password,
- config.Database.Database,
- )
-
- db, err := sqlx.Open("postgres", connectString)
- if err != nil {
- preventClose(config, fmt.Sprintf("Database: Failed to open, %s", err.Error()))
+ // Create the DB pool.
+ var db *sqlx.DB
+ if config.Database.Driver == "sqlite" {
+ dbPath := config.Database.Database
+ if dbPath == "" || dbPath == "erupe" {
+ dbPath = "erupe.db"
+ }
+ db, err = sqlx.Open("sqlite", dbPath+"?_pragma=journal_mode(WAL)&_pragma=foreign_keys(1)")
+ if err != nil {
+ preventClose(config, fmt.Sprintf("Database: Failed to open SQLite %s, %s", dbPath, err.Error()))
+ }
+ // SQLite only supports one writer at a time.
+ db.SetMaxOpenConns(1)
+ logger.Info(fmt.Sprintf("Database: SQLite opened (%s)", dbPath))
+ } else {
+ connectString := fmt.Sprintf(
+ "host='%s' port='%d' user='%s' password='%s' dbname='%s' sslmode=disable",
+ config.Database.Host,
+ config.Database.Port,
+ config.Database.User,
+ config.Database.Password,
+ config.Database.Database,
+ )
+ db, err = sqlx.Open("postgres", connectString)
+ if err != nil {
+ preventClose(config, fmt.Sprintf("Database: Failed to open, %s", err.Error()))
+ }
+ // Configure connection pool to avoid exhausting PostgreSQL under load.
+ db.SetMaxOpenConns(50)
+ db.SetMaxIdleConns(10)
+ db.SetConnMaxLifetime(5 * time.Minute)
+ db.SetConnMaxIdleTime(2 * time.Minute)
}
// Test the DB connection.
@@ -157,12 +177,6 @@ func main() {
preventClose(config, fmt.Sprintf("Database: Failed to ping, %s", err.Error()))
}
- // Configure connection pool to avoid exhausting PostgreSQL under load.
- db.SetMaxOpenConns(50)
- db.SetMaxIdleConns(10)
- db.SetConnMaxLifetime(5 * time.Minute)
- db.SetConnMaxIdleTime(2 * time.Minute)
-
logger.Info("Database: Started successfully")
// Run database migrations
diff --git a/server/api/api_server.go b/server/api/api_server.go
index 6e106a088..13a3297cf 100644
--- a/server/api/api_server.go
+++ b/server/api/api_server.go
@@ -9,6 +9,8 @@ import (
"sync"
"time"
+ dbutil "erupe-ce/common/db"
+
"github.com/gorilla/handlers"
"github.com/gorilla/mux"
"github.com/jmoiron/sqlx"
@@ -33,6 +35,7 @@ type APIServer struct {
sessionRepo APISessionRepo
eventRepo APIEventRepo
httpServer *http.Server
+ startTime time.Time
isShuttingDown bool
}
@@ -45,19 +48,26 @@ func NewAPIServer(config *Config) *APIServer {
httpServer: &http.Server{},
}
if config.DB != nil {
- s.userRepo = NewAPIUserRepository(config.DB)
- s.charRepo = NewAPICharacterRepository(config.DB)
- s.sessionRepo = NewAPISessionRepository(config.DB)
- s.eventRepo = NewAPIEventRepository(config.DB)
+ wdb := dbutil.Wrap(config.DB)
+ s.userRepo = NewAPIUserRepository(wdb)
+ s.charRepo = NewAPICharacterRepository(wdb)
+ s.sessionRepo = NewAPISessionRepository(wdb)
+ s.eventRepo = NewAPIEventRepository(wdb)
}
return s
}
// Start starts the server in a new goroutine.
func (s *APIServer) Start() error {
+ s.startTime = time.Now()
+
// Set up the routes responsible for serving the launcher HTML, serverlist, unique name check, and JP auth.
r := mux.NewRouter()
+ // Dashboard routes (before catch-all)
+ r.HandleFunc("/dashboard", s.Dashboard)
+ r.HandleFunc("/api/dashboard/stats", s.DashboardStatsJSON).Methods("GET")
+
// Legacy routes (unchanged, no method enforcement)
r.HandleFunc("/launcher", s.Launcher)
r.HandleFunc("/login", s.Login)
diff --git a/server/api/dashboard.go b/server/api/dashboard.go
new file mode 100644
index 000000000..3b1b9ac66
--- /dev/null
+++ b/server/api/dashboard.go
@@ -0,0 +1,137 @@
+package api
+
+import (
+ _ "embed"
+ "encoding/json"
+ "fmt"
+ "html/template"
+ "net/http"
+ "time"
+
+ "go.uber.org/zap"
+)
+
+//go:embed dashboard.html
+var dashboardHTML string
+
+var dashboardTmpl = template.Must(template.New("dashboard").Parse(dashboardHTML))
+
+// DashboardStats is the JSON payload returned by GET /api/dashboard/stats.
+type DashboardStats struct {
+ Uptime string `json:"uptime"`
+ ServerVersion string `json:"serverVersion"`
+ ClientMode string `json:"clientMode"`
+ OnlinePlayers int `json:"onlinePlayers"`
+ TotalAccounts int `json:"totalAccounts"`
+ TotalCharacters int `json:"totalCharacters"`
+ Channels []ChannelInfo `json:"channels"`
+ DatabaseOK bool `json:"databaseOK"`
+}
+
+// ChannelInfo describes a single channel server entry from the servers table.
+type ChannelInfo struct {
+ Name string `json:"name"`
+ Port int `json:"port"`
+ Players int `json:"players"`
+}
+
+// Dashboard serves the embedded HTML dashboard page at /dashboard.
+func (s *APIServer) Dashboard(w http.ResponseWriter, r *http.Request) {
+ w.Header().Set("Content-Type", "text/html; charset=utf-8")
+ if err := dashboardTmpl.Execute(w, nil); err != nil {
+ s.logger.Error("Failed to render dashboard", zap.Error(err))
+ http.Error(w, "Internal Server Error", http.StatusInternalServerError)
+ }
+}
+
+// DashboardStatsJSON serves GET /api/dashboard/stats with live server statistics.
+func (s *APIServer) DashboardStatsJSON(w http.ResponseWriter, r *http.Request) {
+ stats := DashboardStats{
+ ServerVersion: "Erupe-CE",
+ ClientMode: s.erupeConfig.ClientMode,
+ }
+
+ // Compute uptime.
+ if !s.startTime.IsZero() {
+ stats.Uptime = formatDuration(time.Since(s.startTime))
+ } else {
+ stats.Uptime = "unknown"
+ }
+
+ // Check database connectivity.
+ if s.db != nil {
+ if err := s.db.Ping(); err != nil {
+ s.logger.Warn("Dashboard: database ping failed", zap.Error(err))
+ stats.DatabaseOK = false
+ } else {
+ stats.DatabaseOK = true
+ }
+ }
+
+ // Query total accounts.
+ if s.db != nil {
+ if err := s.db.QueryRow("SELECT COUNT(*) FROM users").Scan(&stats.TotalAccounts); err != nil {
+ s.logger.Warn("Dashboard: failed to count users", zap.Error(err))
+ }
+ }
+
+ // Query total characters.
+ if s.db != nil {
+ if err := s.db.QueryRow("SELECT COUNT(*) FROM characters").Scan(&stats.TotalCharacters); err != nil {
+ s.logger.Warn("Dashboard: failed to count characters", zap.Error(err))
+ }
+ }
+
+ // Query channel info from servers table.
+ if s.db != nil {
+ rows, err := s.db.Query("SELECT server_id, current_players, world_name, land FROM servers ORDER BY server_id")
+ if err != nil {
+ s.logger.Warn("Dashboard: failed to query servers", zap.Error(err))
+ } else {
+ defer func() { _ = rows.Close() }()
+ for rows.Next() {
+ var serverID, players, land int
+ var worldName *string
+ if err := rows.Scan(&serverID, &players, &worldName, &land); err != nil {
+ s.logger.Warn("Dashboard: failed to scan server row", zap.Error(err))
+ continue
+ }
+ name := "Channel"
+ if worldName != nil {
+ name = *worldName
+ }
+ ch := ChannelInfo{
+ Name: name,
+ Port: 54000 + serverID,
+ Players: players,
+ }
+ stats.Channels = append(stats.Channels, ch)
+ stats.OnlinePlayers += players
+ }
+ }
+ }
+
+ w.Header().Set("Content-Type", "application/json")
+ if err := json.NewEncoder(w).Encode(stats); err != nil {
+ s.logger.Error("Dashboard: failed to encode stats", zap.Error(err))
+ }
+}
+
+// formatDuration produces a human-readable duration string like "2d 5h 32m 10s".
+func formatDuration(d time.Duration) string {
+ days := int(d.Hours()) / 24
+ hours := int(d.Hours()) % 24
+ minutes := int(d.Minutes()) % 60
+ seconds := int(d.Seconds()) % 60
+
+ if days > 0 {
+ return fmt.Sprintf("%dd %dh %dm %ds", days, hours, minutes, seconds)
+ }
+ if hours > 0 {
+ return fmt.Sprintf("%dh %dm %ds", hours, minutes, seconds)
+ }
+ if minutes > 0 {
+ return fmt.Sprintf("%dm %ds", minutes, seconds)
+ }
+ return fmt.Sprintf("%ds", seconds)
+}
diff --git a/server/api/dashboard.html b/server/api/dashboard.html
new file mode 100644
index 000000000..f5553fe83
--- /dev/null
+++ b/server/api/dashboard.html
@@ -0,0 +1,145 @@
+
+
+
+
+
+Erupe Dashboard
+
+
+
+
+
+Failed to fetch server stats
+
+
+
+
+
+
+
Total Characters
+
--
+
+
+
1. Database
2. Schema
- 3. Server
- 4. Finish
+ 3. Quest Files
+ 4. Preset
+ 5. Server
+ 6. Finish
@@ -134,8 +138,39 @@ h1{font-size:1.75rem;margin-bottom:.5rem;color:#e94560;text-align:center}
-
+
+
Quest Files
+
Quest files are needed for gameplay. The server checks the bin/quests/ directory.
+
Checking quest files...
+
+
No quest files found.
+
Download the quest archive:
+
https://files.catbox.moe/xf0l7w.7z
+
Download the archive, extract it, and place the quests/ and scenarios/ folders into the bin/ directory next to the server binary.
+
+
+
+
+
+
+
+
+
+
Gameplay Preset
+
Choose a preset that matches your intended use. This configures channels and gameplay rates.
+
+
+
+
+
+
+
+
Review & Finish
Verify your settings before creating config.json.
-
+
@@ -184,10 +219,13 @@ h1{font-size:1.75rem;margin-bottom:.5rem;color:#e94560;text-align:center}