cmd/horsebot: serve data from mdb instead of json
This commit is contained in:
@@ -13,7 +13,7 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
"path/filepath"
|
"strconv"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/disgoorg/disgo"
|
"github.com/disgoorg/disgo"
|
||||||
@@ -24,15 +24,18 @@ import (
|
|||||||
"github.com/disgoorg/disgo/httpserver"
|
"github.com/disgoorg/disgo/httpserver"
|
||||||
"github.com/disgoorg/disgo/rest"
|
"github.com/disgoorg/disgo/rest"
|
||||||
httpmiddle "github.com/go-chi/chi/v5/middleware"
|
httpmiddle "github.com/go-chi/chi/v5/middleware"
|
||||||
|
"zombiezen.com/go/sqlite"
|
||||||
|
"zombiezen.com/go/sqlite/sqlitex"
|
||||||
|
|
||||||
"git.sunturtle.xyz/zephyr/horse"
|
"git.sunturtle.xyz/zephyr/horse"
|
||||||
|
"git.sunturtle.xyz/zephyr/horse/mdb"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
var (
|
var (
|
||||||
// public site
|
// public site
|
||||||
addr string
|
addr string
|
||||||
dataDir string
|
mdbf string
|
||||||
public string
|
public string
|
||||||
// discord
|
// discord
|
||||||
tokenFile string
|
tokenFile string
|
||||||
@@ -43,7 +46,7 @@ func main() {
|
|||||||
textfmt string
|
textfmt string
|
||||||
)
|
)
|
||||||
flag.StringVar(&addr, "http", ":80", "`address` to bind HTTP server")
|
flag.StringVar(&addr, "http", ":80", "`address` to bind HTTP server")
|
||||||
flag.StringVar(&dataDir, "data", "", "`dir`ectory containing exported json data")
|
flag.StringVar(&mdbf, "mdb", "", "`path` to master.mdb")
|
||||||
flag.StringVar(&public, "public", "", "`dir`ectory containing the website to serve")
|
flag.StringVar(&public, "public", "", "`dir`ectory containing the website to serve")
|
||||||
flag.StringVar(&tokenFile, "token", "", "`file` containing the Discord bot token")
|
flag.StringVar(&tokenFile, "token", "", "`file` containing the Discord bot token")
|
||||||
flag.StringVar(&apiRoute, "route", "/interactions/callback", "`path` to serve Discord HTTP API calls")
|
flag.StringVar(&apiRoute, "route", "/interactions/callback", "`path` to serve Discord HTTP API calls")
|
||||||
@@ -74,9 +77,17 @@ func main() {
|
|||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
skills, err := loadSkills(filepath.Join(dataDir, "skill.json"))
|
ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt)
|
||||||
|
|
||||||
|
db, err := sqlitex.NewPool(mdbf, sqlitex.PoolOptions{Flags: sqlite.OpenReadOnly})
|
||||||
|
if err != nil {
|
||||||
|
slog.Error("mdb", slog.Any("err", err))
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
skills, err := mdb.Skills(ctx, db)
|
||||||
slog.Info("loaded skills", slog.Int("count", len(skills)))
|
slog.Info("loaded skills", slog.Int("count", len(skills)))
|
||||||
groups, err2 := loadSkillGroups(filepath.Join(dataDir, "skill-group.json"))
|
groups, err2 := mdb.SkillGroups(ctx, db)
|
||||||
slog.Info("loaded skill groups", slog.Int("count", len(groups)))
|
slog.Info("loaded skill groups", slog.Int("count", len(groups)))
|
||||||
if err = errors.Join(err, err2); err != nil {
|
if err = errors.Join(err, err2); err != nil {
|
||||||
slog.Error("loading data", slog.Any("err", err))
|
slog.Error("loading data", slog.Any("err", err))
|
||||||
@@ -92,8 +103,6 @@ func main() {
|
|||||||
}
|
}
|
||||||
token = bytes.TrimSuffix(token, []byte{'\n'})
|
token = bytes.TrimSuffix(token, []byte{'\n'})
|
||||||
|
|
||||||
ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt)
|
|
||||||
|
|
||||||
r := handler.New()
|
r := handler.New()
|
||||||
r.DefaultContext(func() context.Context { return ctx })
|
r.DefaultContext(func() context.Context { return ctx })
|
||||||
r.Use(middleware.Go)
|
r.Use(middleware.Go)
|
||||||
@@ -113,7 +122,16 @@ func main() {
|
|||||||
|
|
||||||
mux := http.NewServeMux()
|
mux := http.NewServeMux()
|
||||||
mux.Handle("GET /", httpmiddle.Compress(5)(http.FileServerFS(os.DirFS(public))))
|
mux.Handle("GET /", httpmiddle.Compress(5)(http.FileServerFS(os.DirFS(public))))
|
||||||
mux.Handle("GET /api/data/", httpmiddle.Compress(5)(http.StripPrefix("/api/data", http.FileServerFS(os.DirFS(dataDir)))))
|
mux.Handle("GET /api/data/affinity", httpmiddle.Compress(5)(dataroute(ctx, db, mdb.AffinitySummary)))
|
||||||
|
mux.Handle("GET /api/data/character", httpmiddle.Compress(5)(dataroute(ctx, db, mdb.Characters)))
|
||||||
|
mux.Handle("GET /api/data/conversation", httpmiddle.Compress(5)(dataroute(ctx, db, mdb.Conversations)))
|
||||||
|
mux.Handle("GET /api/data/race", httpmiddle.Compress(5)(dataroute(ctx, db, mdb.Races)))
|
||||||
|
mux.Handle("GET /api/data/saddle", httpmiddle.Compress(5)(dataroute(ctx, db, mdb.Saddles)))
|
||||||
|
mux.Handle("GET /api/data/scenario", httpmiddle.Compress(5)(dataroute(ctx, db, mdb.Scenarios)))
|
||||||
|
mux.Handle("GET /api/data/skill", httpmiddle.Compress(5)(dataroute(ctx, db, mdb.Skills)))
|
||||||
|
mux.Handle("GET /api/data/skill-group", httpmiddle.Compress(5)(dataroute(ctx, db, mdb.SkillGroups)))
|
||||||
|
mux.Handle("GET /api/data/spark", httpmiddle.Compress(5)(dataroute(ctx, db, mdb.Sparks)))
|
||||||
|
mux.Handle("GET /api/data/uma", httpmiddle.Compress(5)(dataroute(ctx, db, mdb.Umas)))
|
||||||
if pubkey != "" {
|
if pubkey != "" {
|
||||||
pk, err := hex.DecodeString(pubkey)
|
pk, err := hex.DecodeString(pubkey)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -209,3 +227,23 @@ func loadSkillGroups(file string) ([]horse.SkillGroup, error) {
|
|||||||
}
|
}
|
||||||
return groups, nil
|
return groups, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func dataroute[T any](ctx context.Context, db *sqlitex.Pool, f func(context.Context, *sqlitex.Pool) ([]T, error)) http.HandlerFunc {
|
||||||
|
return func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
data, err := f(ctx, db)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
b, err := json.Marshal(data)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
w.Header().Set("Content-Length", strconv.Itoa(len(b)))
|
||||||
|
if _, err := w.Write(b); err != nil {
|
||||||
|
slog.Error("writing response", slog.Any("err", err))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user