ALL_WORLDS excluding 17

.air.toml

@@ -0,0 +1,51 @@
+root = "."
+testdata_dir = "testdata"
+tmp_dir = "tmp"
+
+[build]
+args_bin = []
+bin = "./tmp/main"
+cmd = "go build -o ./tmp/main ."
+delay = 1000
+exclude_dir = ["assets", "tmp", "vendor", "testdata"]
+exclude_file = []
+exclude_regex = ["_test.go"]
+exclude_unchanged = false
+follow_symlink = false
+full_bin = ""
+include_dir = []
+include_ext = ["go", "tpl", "tmpl", "html", "css", "js"]
+include_file = []
+kill_delay = "0s"
+log = "build-errors.log"
+poll = false
+poll_interval = 0
+post_cmd = []
+pre_cmd = []
+rerun = false
+rerun_delay = 500
+send_interrupt = false
+stop_on_error = false
+
+[color]
+app = ""
+build = "yellow"
+main = "magenta"
+runner = "green"
+watcher = "cyan"
+
+[log]
+main_only = false
+time = false
+
+[misc]
+clean_on_exit = false
+
+[proxy]
+app_port = 8769
+enabled = true
+proxy_port = 8001
+
+[screen]
+clear_on_rebuild = false
+keep_scroll = true

clients/common.go

@@ -32,7 +32,7 @@ func (c *CommonClient) Request(ctx context.Context, path string) (*http.Response
 	if res.StatusCode != http.StatusOK {
 		body, err := io.ReadAll(res.Body)
 		if err != nil {
-			body = []byte(fmt.Sprintf("<< unable to read (%s) >>", err))
+			body = fmt.Appendf(nil, "<< unable to read (%s) >>", err)
 		}
 		return res, fmt.Errorf("http request not 200, got: %d\nresponse body: %s", res.StatusCode, string(body))
 	}

cmd/agg.ps2.live/main.go

@@ -31,7 +31,7 @@ func main() {
 
 	allWorldsEnv := os.Getenv("ALL_WORLDS")
 	if allWorldsEnv == "" {
-		allWorldsEnv = "1,10,17,19,40,1000,2000"
+		allWorldsEnv = "1,10,19,40,1000,2000"
 	}
 	AllWorlds = envListToU32(allWorldsEnv)
 

cmd/ps2.live/index.go

@@ -0,0 +1,55 @@
+package main
+
+import (
+	"context"
+	"log"
+	"net/http"
+	"time"
+
+	metagameps2live "git.sapphic.engineer/ps2.live/ps2.live/clients/metagame.ps2.live"
+	"git.sapphic.engineer/ps2.live/ps2.live/types"
+)
+
+type indexData struct {
+	Worlds []indexWorld
+}
+
+type indexWorld struct {
+	ID          uint32
+	Presentable presentableServer
+	Population  *types.AggPopWorld
+	Metagame    *types.MetagameWorld
+}
+
+func handleIndex(rw http.ResponseWriter, req *http.Request) {
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
+	defer cancel()
+
+	metagame := metagameps2live.NewMetagameClient()
+	mgWorlds, err := metagame.GetAllWorlds(ctx)
+	if err != nil {
+		log.Println("metagame worlds fetch failed")
+		rw.WriteHeader(500)
+		rw.Write([]byte("internal server error"))
+	}
+
+	worlds := make([]indexWorld, len(mgWorlds))
+	for i, world := range mgWorlds {
+		worlds[i] = indexWorld{
+			ID:          world.ID,
+			Presentable: idToPresentable(world.ID),
+			Metagame:    world,
+			Population: ,
+		}
+	}
+
+	t := templates.Lookup("index")
+	t.Execute(rw, templateData{
+		Index: indexData{
+			Worlds: worlds,
+		},
+		Meta: templateMeta{
+			Title: "aaaa",
+		},
+	})
+}

cmd/ps2.live/main.go

@@ -13,6 +13,7 @@ var (
 
 type templateData struct {
 	Meta  templateMeta
+	Index indexData
 }
 
 type templateMeta struct {
@@ -25,28 +26,15 @@ func main() {
 		addr = ":8000"
 	}
 
-	// fmt.Println(templates.Templates())
-
 	mux := http.NewServeMux()
 	mux.HandleFunc("/worlds/{id}", handleWorld)
 	mux.Handle("/", http.FileServerFS(StaticFileFS))
 	mux.HandleFunc("/{$}", handleIndex)
 
+	log.Println("Listening on", addr)
+
 	err := http.ListenAndServe(addr, mux)
 	if err != nil {
 		log.Fatalln(err)
 	}
 }
-
-func handleIndex(rw http.ResponseWriter, req *http.Request) {
-	t := templates.Lookup("index")
-	t.Execute(rw, templateData{
-		Meta: templateMeta{
-			Title: "aaaa",
-		},
-	})
-}
-
-func handleWorld(rw http.ResponseWriter, req *http.Request) {
-
-}

cmd/ps2.live/templates/index.html.tmpl

@@ -22,7 +22,7 @@
         <div>{{ .Totals.NC }}</div>
         <div>{{ .Totals.TR }}</div>
       </div>
-      {{ template "bar-chart" . }}
+      {{ template "components/bar-chart" . }}
     </div>
   </div>
 </div>

cmd/ps2.live/utils.go

@@ -0,0 +1,93 @@
+package main
+
+import (
+	"fmt"
+	"time"
+)
+
+var (
+	idToPresentableMap = map[uint32]presentableServer{
+		1: presentableServer{
+			Name:     "Connery",
+			Region:   "US-W",
+			Platform: "PC",
+		},
+		10: presentableServer{
+			Name:     "Miller",
+			Region:   "EU",
+			Platform: "PC",
+		},
+		17: presentableServer{
+			Name:     "Emerald",
+			Region:   "US-E",
+			Platform: "PC",
+		},
+		19: presentableServer{
+			Name:     "Jaeger",
+			Region:   "US-E",
+			Platform: "PC",
+		},
+		40: presentableServer{
+			Name:     "SolTech",
+			Region:   "JP",
+			Platform: "PC",
+		},
+		1000: presentableServer{
+			Name:     "Genudine",
+			Region:   "US-E",
+			Platform: "PS4",
+		},
+		2000: presentableServer{
+			Name:     "Ceres",
+			Region:   "EU",
+			Platform: "PS4",
+		},
+
+		// After 8 April
+		999901: presentableServer{
+			Name:     "Osprey",
+			Region:   "US-W", // dunno which haha
+			Platform: "PC",
+		},
+		999910: presentableServer{
+			Name:     "Wainwright",
+			Region:   "EU",
+			Platform: "PC",
+		},
+		999917: presentableServer{
+			Name:     "Osprey",
+			Region:   "US-E",
+			Platform: "PC",
+		},
+	}
+
+	nameChangeDate = time.Date(2025, 4, 8, 7, 0, 0, 0, time.UTC) // Midnight DBG time
+	nameChanged    = !time.Now().Before(nameChangeDate)
+)
+
+type presentableServer struct {
+	Name     string
+	Region   string
+	Platform string
+}
+
+func idToPresentable(id uint32) (ps presentableServer) {
+	var ok bool
+	if nameChanged {
+		ps, ok = idToPresentableMap[id+999900]
+		if ok {
+			return ps
+		}
+	}
+
+	ps, ok = idToPresentableMap[id]
+	if !ok {
+		return presentableServer{
+			Name:     fmt.Sprintf("??? (ID: %d)", id),
+			Region:   "??",
+			Platform: "??",
+		}
+	}
+
+	return ps
+}

cmd/ps2.live/world.go

@@ -0,0 +1,7 @@
+package main
+
+import "net/http"
+
+func handleWorld(rw http.ResponseWriter, req *http.Request) {
+
+}

justfile

@@ -0,0 +1,2 @@
+dev cmd inner_port="8769":
+	ADDR=":{{inner_port}}" air -build.cmd="go build -o ./tmp/main ./cmd/{{cmd}}" -proxy.app_port="{{inner_port}}"

shell.nix

@@ -2,5 +2,7 @@
 pkgs.mkShell {
   buildInputs = with pkgs; [
     go
+    air
+    just
   ];
 }

tmp/build-errors.log

@@ -0,0 +1 @@
+exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1