Compare commits
10 Commits
b7a78bedae
...
ad35abb995
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ad35abb995 | ||
|
|
47321142ea | ||
|
|
71929c8bfa | ||
|
|
6b6f47035a | ||
|
|
fbaaa1303f | ||
|
|
7f4a079d95 | ||
|
|
b6014d1d93 | ||
|
|
d8b422fa23 | ||
|
|
3815de0ed3 | ||
|
|
c411a07bbf |
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
||||
**/*.sw*
|
||||
21
go.mod
Normal file
21
go.mod
Normal file
@@ -0,0 +1,21 @@
|
||||
module gitea/price-is-wrong
|
||||
|
||||
go 1.22.3
|
||||
|
||||
require github.com/glebarez/sqlite v1.11.0
|
||||
|
||||
require (
|
||||
github.com/dustin/go-humanize v1.0.1 // indirect
|
||||
github.com/glebarez/go-sqlite v1.21.2 // indirect
|
||||
github.com/google/uuid v1.3.0 // indirect
|
||||
github.com/jinzhu/inflection v1.0.0 // indirect
|
||||
github.com/jinzhu/now v1.1.5 // indirect
|
||||
github.com/mattn/go-isatty v0.0.17 // indirect
|
||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
|
||||
golang.org/x/sys v0.7.0 // indirect
|
||||
gorm.io/gorm v1.25.7 // indirect
|
||||
modernc.org/libc v1.22.5 // indirect
|
||||
modernc.org/mathutil v1.5.0 // indirect
|
||||
modernc.org/memory v1.5.0 // indirect
|
||||
modernc.org/sqlite v1.23.1 // indirect
|
||||
)
|
||||
32
go.sum
Normal file
32
go.sum
Normal file
@@ -0,0 +1,32 @@
|
||||
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/glebarez/go-sqlite v1.21.2 h1:3a6LFC4sKahUunAmynQKLZceZCOzUthkRkEAl9gAXWo=
|
||||
github.com/glebarez/go-sqlite v1.21.2/go.mod h1:sfxdZyhQjTM2Wry3gVYWaW072Ri1WMdWJi0k6+3382k=
|
||||
github.com/glebarez/sqlite v1.11.0 h1:wSG0irqzP6VurnMEpFGer5Li19RpIRi2qvQz++w0GMw=
|
||||
github.com/glebarez/sqlite v1.11.0/go.mod h1:h8/o8j5wiAsqSPoWELDUdJXhjAhsVliSn7bWZjOhrgQ=
|
||||
github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
|
||||
github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo=
|
||||
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
|
||||
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
|
||||
github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
|
||||
github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
|
||||
github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
|
||||
github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
|
||||
github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
|
||||
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
|
||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
|
||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
|
||||
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
|
||||
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
gorm.io/gorm v1.25.7 h1:VsD6acwRjz2zFxGO50gPO6AkNs7KKnvfzUjHQhZDz/A=
|
||||
gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
|
||||
modernc.org/libc v1.22.5 h1:91BNch/e5B0uPbJFgqbxXuOnxBQjlS//icfQEGmvyjE=
|
||||
modernc.org/libc v1.22.5/go.mod h1:jj+Z7dTNX8fBScMVNRAYZ/jF91K8fdT2hYMThc3YjBY=
|
||||
modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ=
|
||||
modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
|
||||
modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds=
|
||||
modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
|
||||
modernc.org/sqlite v1.23.1 h1:nrSBg4aRQQwq59JpvGEQ15tNxoO5pX/kUjcRNwSAGQM=
|
||||
modernc.org/sqlite v1.23.1/go.mod h1:OrDj17Mggn6MhE+iPbBNf7RGKODDE9NFT0f3EwDzJqk=
|
||||
15
src/lib/db.go
Normal file
15
src/lib/db.go
Normal file
@@ -0,0 +1,15 @@
|
||||
package lib
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
)
|
||||
|
||||
func InjectDB(ctx context.Context, db *sql.DB) context.Context {
|
||||
return context.WithValue(ctx, "__db__", db)
|
||||
}
|
||||
|
||||
func ExtractDB(ctx context.Context) *sql.DB {
|
||||
v, _ := ctx.Value("__db__").(*sql.DB)
|
||||
return v
|
||||
}
|
||||
20
src/lib/db_test.go
Normal file
20
src/lib/db_test.go
Normal file
@@ -0,0 +1,20 @@
|
||||
package lib_test
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"gitea/price-is-wrong/src/lib"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestInjectDB(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
db := &sql.DB{}
|
||||
|
||||
injected := lib.InjectDB(ctx, db)
|
||||
extracted := lib.ExtractDB(injected)
|
||||
|
||||
if db != extracted {
|
||||
t.Fatal("couldnt extract injected db")
|
||||
}
|
||||
}
|
||||
20
src/lib/test.go
Normal file
20
src/lib/test.go
Normal file
@@ -0,0 +1,20 @@
|
||||
package lib
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"path"
|
||||
"testing"
|
||||
|
||||
_ "github.com/glebarez/sqlite"
|
||||
)
|
||||
|
||||
func NewTestCtx(t *testing.T) context.Context {
|
||||
d := t.TempDir()
|
||||
db, err := sql.Open("sqlite", path.Join(d, "db.db"))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Cleanup(func() { db.Close() })
|
||||
return InjectDB(context.Background(), db)
|
||||
}
|
||||
27
src/lib/test_test.go
Normal file
27
src/lib/test_test.go
Normal file
@@ -0,0 +1,27 @@
|
||||
package lib_test
|
||||
|
||||
import (
|
||||
"context"
|
||||
"gitea/price-is-wrong/src/lib"
|
||||
"sync"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestTestCtx(t *testing.T) {
|
||||
var ctx context.Context
|
||||
wg := &sync.WaitGroup{}
|
||||
wg.Add(1)
|
||||
t.Run("subtest", func(t *testing.T) {
|
||||
defer wg.Done()
|
||||
ctx = lib.NewTestCtx(t)
|
||||
db := lib.ExtractDB(ctx)
|
||||
if _, err := db.Exec(`SELECT 1`); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
})
|
||||
wg.Wait()
|
||||
db := lib.ExtractDB(ctx)
|
||||
if _, err := db.Exec(`SELECT 1`); err == nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
63
src/state/lobby/event.go
Normal file
63
src/state/lobby/event.go
Normal file
@@ -0,0 +1,63 @@
|
||||
package lobby
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
)
|
||||
|
||||
type Event interface {
|
||||
LobbyEvent()
|
||||
}
|
||||
|
||||
type PlayerJoin struct {
|
||||
ID int
|
||||
}
|
||||
|
||||
func (PlayerJoin) LobbyEvent() {}
|
||||
|
||||
type PlayerLeave struct {
|
||||
ID int
|
||||
}
|
||||
|
||||
func (PlayerLeave) LobbyEvent() {}
|
||||
|
||||
func ParseEvent(b []byte) (Event, error) {
|
||||
var wrapper struct {
|
||||
Type string `json:"type"`
|
||||
Package string `json:"package"`
|
||||
Payload json.RawMessage `json:"payload"`
|
||||
}
|
||||
if err := json.Unmarshal(b, &wrapper); err != nil {
|
||||
return nil, err
|
||||
} else if wrapper.Package != "lobby" {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
var e Event
|
||||
var err error
|
||||
switch wrapper.Type {
|
||||
case "lobby.PlayerJoin":
|
||||
v := PlayerJoin{}
|
||||
err = json.Unmarshal(wrapper.Payload, &v)
|
||||
e = v
|
||||
case "lobby.PlayerLeave":
|
||||
v := PlayerLeave{}
|
||||
err = json.Unmarshal(wrapper.Payload, &v)
|
||||
e = v
|
||||
default:
|
||||
return nil, fmt.Errorf("failed to parse event %q", wrapper.Type)
|
||||
}
|
||||
return e, err
|
||||
}
|
||||
|
||||
func MarshalEvent(e Event) ([]byte, error) {
|
||||
var marshalme struct {
|
||||
Payload Event `json:"payload"`
|
||||
Type string `json:"type"`
|
||||
Package string `json:"package"`
|
||||
}
|
||||
marshalme.Payload = e
|
||||
marshalme.Type = fmt.Sprintf("%T", e)
|
||||
marshalme.Package = "lobby"
|
||||
return json.Marshal(marshalme)
|
||||
}
|
||||
36
src/state/lobby/event_test.go
Normal file
36
src/state/lobby/event_test.go
Normal file
@@ -0,0 +1,36 @@
|
||||
package lobby_test
|
||||
|
||||
import (
|
||||
"gitea/price-is-wrong/src/state/lobby"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestMarshalUnmarshal(t *testing.T) {
|
||||
cases := map[string]struct {
|
||||
e lobby.Event
|
||||
}{
|
||||
"PlayerJoin": {e: lobby.PlayerJoin{ID: 1}},
|
||||
"PlayerLeave": {e: lobby.PlayerLeave{ID: 1}},
|
||||
}
|
||||
|
||||
for name, d := range cases {
|
||||
c := d
|
||||
t.Run(name, func(t *testing.T) {
|
||||
b, err := lobby.MarshalEvent(c.e)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Logf("marshalled: %s", b)
|
||||
|
||||
e, err := lobby.ParseEvent(b)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Logf("unmarshalled: %+v", e)
|
||||
|
||||
if c.e != e {
|
||||
t.Errorf("expected %+v but got %+v", c.e, e)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
11
src/state/lobby/lobby.go
Normal file
11
src/state/lobby/lobby.go
Normal file
@@ -0,0 +1,11 @@
|
||||
package lobby
|
||||
|
||||
import "context"
|
||||
|
||||
type Lobby interface{}
|
||||
|
||||
type lobby struct{}
|
||||
|
||||
func NewLobby(ctx context.Context) (Lobby, error) {
|
||||
return lobby{}, nil
|
||||
}
|
||||
24
src/state/lobby/storage.go
Normal file
24
src/state/lobby/storage.go
Normal file
@@ -0,0 +1,24 @@
|
||||
package lobby
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"gitea/price-is-wrong/src/lib"
|
||||
)
|
||||
|
||||
type Storage interface {
|
||||
}
|
||||
|
||||
type DB struct{ db *sql.DB }
|
||||
|
||||
var _ Storage = DB{}
|
||||
|
||||
func NewDB(ctx context.Context) (DB, error) {
|
||||
db := lib.ExtractDB(ctx)
|
||||
if db == nil {
|
||||
return DB{}, fmt.Errorf("db in context expected")
|
||||
}
|
||||
|
||||
return DB{db: db}, nil
|
||||
}
|
||||
15
src/state/lobby/storage_test.go
Normal file
15
src/state/lobby/storage_test.go
Normal file
@@ -0,0 +1,15 @@
|
||||
package lobby_test
|
||||
|
||||
import (
|
||||
"gitea/price-is-wrong/src/lib"
|
||||
"gitea/price-is-wrong/src/state/lobby"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestDB(t *testing.T) {
|
||||
db, err := lobby.NewDB(lib.NewTestCtx(t))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
_ = db
|
||||
}
|
||||
5
src/state/state.go
Normal file
5
src/state/state.go
Normal file
@@ -0,0 +1,5 @@
|
||||
package state
|
||||
|
||||
type State struct {
|
||||
Lobby lobby.Lobby
|
||||
}
|
||||
Reference in New Issue
Block a user