feat: get server building again

cmd/cs/main.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"log"
 	"github.com/cfoust/sour/pkg/cs"
+	"log"
 )
 
 func Test(a int) {

cmd/demo/main.go

@@ -4,8 +4,8 @@ import (
 	"compress/gzip"
 	"flag"
 	"io"
-	"os"
 	"log"
+	"os"
 	"time"
 
 	I "github.com/cfoust/sour/pkg/game/io"

cmd/server/auth/module.go

@@ -14,9 +14,9 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/cfoust/sour/svc/server/auth/crypto"
-	"github.com/cfoust/sour/svc/server/config"
-	"github.com/cfoust/sour/svc/server/state"
+	"github.com/cfoust/sour/cmd/server/auth/crypto"
+	"github.com/cfoust/sour/cmd/server/config"
+	"github.com/cfoust/sour/cmd/server/state"
 
 	"gorm.io/gorm"
 )

cmd/server/ingress/enet.go

@@ -6,10 +6,10 @@ import (
 	"sync"
 	"time"
 
+	"github.com/cfoust/sour/cmd/server/state"
 	"github.com/cfoust/sour/pkg/enet"
 	"github.com/cfoust/sour/pkg/game/io"
 	"github.com/cfoust/sour/pkg/utils"
-	"github.com/cfoust/sour/svc/server/state"
 )
 
 type PacketACK struct {

cmd/server/ingress/module.go

@@ -1,9 +1,9 @@
 package ingress
 
 import (
+	"github.com/cfoust/sour/cmd/server/state"
 	"github.com/cfoust/sour/pkg/game/io"
 	"github.com/cfoust/sour/pkg/utils"
-	"github.com/cfoust/sour/svc/server/state"
 )
 
 // A unique identifier for this client for the lifetime of their session.

cmd/server/ingress/ws.go

@@ -8,16 +8,16 @@ import (
 	"sync"
 	"time"
 
+	"github.com/cfoust/sour/cmd/server/auth"
+	"github.com/cfoust/sour/cmd/server/state"
+	"github.com/cfoust/sour/cmd/server/watcher"
 	"github.com/cfoust/sour/pkg/game/io"
 	"github.com/cfoust/sour/pkg/utils"
-	"github.com/cfoust/sour/svc/server/auth"
-	"github.com/cfoust/sour/svc/server/state"
-	"github.com/cfoust/sour/svc/server/watcher"
 
 	"github.com/fxamacker/cbor/v2"
 	"github.com/mileusna/useragent"
-	"nhooyr.io/websocket"
 	"github.com/rs/zerolog/log"
+	"nhooyr.io/websocket"
 )
 
 const (

cmd/server/main.go

@@ -9,12 +9,12 @@ import (
 	"os/signal"
 	"time"
 
+	"github.com/cfoust/sour/cmd/server/config"
+	"github.com/cfoust/sour/cmd/server/ingress"
+	"github.com/cfoust/sour/cmd/server/servers"
+	"github.com/cfoust/sour/cmd/server/service"
+	"github.com/cfoust/sour/cmd/server/static"
 	"github.com/cfoust/sour/pkg/assets"
-	"github.com/cfoust/sour/svc/server/config"
-	"github.com/cfoust/sour/svc/server/ingress"
-	"github.com/cfoust/sour/svc/server/servers"
-	"github.com/cfoust/sour/svc/server/service"
-	"github.com/cfoust/sour/svc/server/static"
 
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"

cmd/server/servers/module.go

@@ -11,13 +11,13 @@ import (
 	"sync"
 	"time"
 
+	"github.com/cfoust/sour/cmd/server/config"
+	"github.com/cfoust/sour/cmd/server/ingress"
 	"github.com/cfoust/sour/pkg/assets"
 	C "github.com/cfoust/sour/pkg/game/constants"
 	P "github.com/cfoust/sour/pkg/game/protocol"
 	"github.com/cfoust/sour/pkg/maps"
 	"github.com/cfoust/sour/pkg/server"
-	"github.com/cfoust/sour/svc/server/config"
-	"github.com/cfoust/sour/svc/server/ingress"
 
 	"github.com/repeale/fp-go"
 	"github.com/repeale/fp-go/option"

cmd/server/service/auth.go

@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/cfoust/sour/cmd/server/auth"
+	"github.com/cfoust/sour/cmd/server/state"
 	"github.com/cfoust/sour/pkg/game"
 	P "github.com/cfoust/sour/pkg/game/protocol"
-	"github.com/cfoust/sour/svc/server/auth"
-	"github.com/cfoust/sour/svc/server/state"
 )
 
 func (c *Cluster) DoAuthChallenge(ctx context.Context, user *User, id string) (*state.User, error) {

cmd/server/service/commands.go

@@ -7,13 +7,13 @@ import (
 	"strings"
 	"time"
 
+	"github.com/cfoust/sour/cmd/server/ingress"
+	"github.com/cfoust/sour/cmd/server/servers"
+	"github.com/cfoust/sour/cmd/server/verse"
 	"github.com/cfoust/sour/pkg/game"
 	"github.com/cfoust/sour/pkg/game/commands"
 	"github.com/cfoust/sour/pkg/game/constants"
 	"github.com/cfoust/sour/pkg/server/protocol/gamemode"
-	"github.com/cfoust/sour/svc/server/ingress"
-	"github.com/cfoust/sour/svc/server/servers"
-	"github.com/cfoust/sour/svc/server/verse"
 
 	"github.com/repeale/fp-go/option"
 	"github.com/rs/zerolog/log"

cmd/server/service/cs.go

@@ -7,9 +7,9 @@ import (
 	"time"
 
 	"github.com/cfoust/sour/pkg/game"
-	"github.com/cfoust/sour/pkg/utils"
 	C "github.com/cfoust/sour/pkg/game/constants"
 	P "github.com/cfoust/sour/pkg/game/protocol"
+	"github.com/cfoust/sour/pkg/utils"
 )
 
 //go:embed purgatory.ogz
@@ -25,7 +25,7 @@ func sendServerInfo(ctx context.Context, u *User, domain string) (P.Connect, err
 		info,
 	)
 	if err != nil {
-	    return P.Connect{}, err
+		return P.Connect{}, err
 	}
 
 	connect := msg.(P.Connect)

cmd/server/service/elo.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"sync"
 
-	"github.com/cfoust/sour/svc/server/config"
-	"github.com/cfoust/sour/svc/server/state"
+	"github.com/cfoust/sour/cmd/server/config"
+	"github.com/cfoust/sour/cmd/server/state"
 
 	"gorm.io/gorm"
 )

cmd/server/service/events.go

@@ -6,14 +6,14 @@ import (
 	"strings"
 	"time"
 
+	"github.com/cfoust/sour/cmd/server/ingress"
+	"github.com/cfoust/sour/cmd/server/servers"
 	"github.com/cfoust/sour/pkg/chanlock"
 	"github.com/cfoust/sour/pkg/game"
 	"github.com/cfoust/sour/pkg/game/constants"
 	"github.com/cfoust/sour/pkg/game/io"
 	P "github.com/cfoust/sour/pkg/game/protocol"
 	S "github.com/cfoust/sour/pkg/server"
-	"github.com/cfoust/sour/svc/server/ingress"
-	"github.com/cfoust/sour/svc/server/servers"
 
 	"github.com/rs/zerolog/log"
 )

cmd/server/service/matchmaking.go

@@ -6,12 +6,12 @@ import (
 	"sync"
 	"time"
 
+	"github.com/cfoust/sour/cmd/server/config"
+	"github.com/cfoust/sour/cmd/server/ingress"
+	"github.com/cfoust/sour/cmd/server/servers"
 	"github.com/cfoust/sour/pkg/game"
 	P "github.com/cfoust/sour/pkg/game/protocol"
 	"github.com/cfoust/sour/pkg/mmr"
-	"github.com/cfoust/sour/svc/server/config"
-	"github.com/cfoust/sour/svc/server/ingress"
-	"github.com/cfoust/sour/svc/server/servers"
 
 	"github.com/repeale/fp-go/option"
 	"github.com/rs/zerolog"

cmd/server/service/module.go

@@ -5,16 +5,16 @@ import (
 	"sync"
 	"time"
 
+	"github.com/cfoust/sour/cmd/server/auth"
+	"github.com/cfoust/sour/cmd/server/config"
+	"github.com/cfoust/sour/cmd/server/ingress"
+	"github.com/cfoust/sour/cmd/server/servers"
+	"github.com/cfoust/sour/cmd/server/verse"
 	"github.com/cfoust/sour/pkg/assets"
 	"github.com/cfoust/sour/pkg/chanlock"
 	"github.com/cfoust/sour/pkg/game"
 	"github.com/cfoust/sour/pkg/game/commands"
 	P "github.com/cfoust/sour/pkg/game/protocol"
-	"github.com/cfoust/sour/svc/server/auth"
-	"github.com/cfoust/sour/svc/server/config"
-	"github.com/cfoust/sour/svc/server/ingress"
-	"github.com/cfoust/sour/svc/server/servers"
-	"github.com/cfoust/sour/svc/server/verse"
 
 	"github.com/go-redis/redis/v9"
 	"github.com/rs/zerolog/log"

cmd/server/service/users.go

@@ -14,11 +14,11 @@ import (
 	"github.com/cfoust/sour/pkg/server"
 	"github.com/cfoust/sour/pkg/utils"
 
-	"github.com/cfoust/sour/svc/server/config"
-	"github.com/cfoust/sour/svc/server/ingress"
-	"github.com/cfoust/sour/svc/server/servers"
-	"github.com/cfoust/sour/svc/server/state"
-	"github.com/cfoust/sour/svc/server/verse"
+	"github.com/cfoust/sour/cmd/server/config"
+	"github.com/cfoust/sour/cmd/server/ingress"
+	"github.com/cfoust/sour/cmd/server/servers"
+	"github.com/cfoust/sour/cmd/server/state"
+	"github.com/cfoust/sour/cmd/server/verse"
 
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"

cmd/server/state/module.go

@@ -1,7 +1,7 @@
 package state
 
 import (
-	"github.com/cfoust/sour/svc/server/config"
+	"github.com/cfoust/sour/cmd/server/config"
 
 	"github.com/go-redis/redis/v9"
 )

cmd/server/stores/module.go

@@ -6,10 +6,10 @@ import (
 	"os"
 	"time"
 
+	"github.com/cfoust/sour/cmd/server/config"
+	"github.com/cfoust/sour/cmd/server/state"
 	"github.com/cfoust/sour/pkg/assets"
 	"github.com/cfoust/sour/pkg/utils"
-	"github.com/cfoust/sour/svc/server/config"
-	"github.com/cfoust/sour/svc/server/state"
 
 	"gorm.io/gorm"
 )
@@ -30,7 +30,7 @@ func (s *AssetStorage) Get(ctx context.Context, asset *state.Asset) ([]byte, err
 	asset.Accessed = time.Now()
 	err := s.db.WithContext(ctx).Save(asset).Error
 	if err != nil {
-	    return nil, err
+		return nil, err
 	}
 
 	return store.Get(ctx, asset.Hash)

cmd/server/verse/editing.go

@@ -7,11 +7,11 @@ import (
 	"time"
 	"unsafe"
 
+	"github.com/cfoust/sour/cmd/server/ingress"
 	C "github.com/cfoust/sour/pkg/game/constants"
 	P "github.com/cfoust/sour/pkg/game/protocol"
 	"github.com/cfoust/sour/pkg/maps"
 	"github.com/cfoust/sour/pkg/maps/worldio"
-	"github.com/cfoust/sour/svc/server/ingress"
 
 	"github.com/rs/zerolog/log"
 )

cmd/server/verse/module.go

@@ -9,10 +9,10 @@ import (
 	"regexp"
 	"time"
 
+	"github.com/cfoust/sour/cmd/server/state"
+	"github.com/cfoust/sour/cmd/server/stores"
 	"github.com/cfoust/sour/pkg/maps"
 	"github.com/cfoust/sour/pkg/utils"
-	"github.com/cfoust/sour/svc/server/state"
-	"github.com/cfoust/sour/svc/server/stores"
 
 	"gorm.io/gorm"
 )

cmd/server/verse/spaces.go

@@ -8,14 +8,14 @@ import (
 	"strings"
 	"time"
 
+	"github.com/cfoust/sour/cmd/server/config"
+	"github.com/cfoust/sour/cmd/server/ingress"
+	gameServers "github.com/cfoust/sour/cmd/server/servers"
 	"github.com/cfoust/sour/pkg/assets"
 	"github.com/cfoust/sour/pkg/game/commands"
 	C "github.com/cfoust/sour/pkg/game/constants"
 	"github.com/cfoust/sour/pkg/server"
 	"github.com/cfoust/sour/pkg/utils"
-	"github.com/cfoust/sour/svc/server/config"
-	"github.com/cfoust/sour/svc/server/ingress"
-	gameServers "github.com/cfoust/sour/svc/server/servers"
 
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"

cmd/server/watcher/module.go

@@ -91,8 +91,8 @@ type Server struct {
 type Servers map[Address]Server
 
 type Watcher struct {
-	serverMutex  sync.Mutex
-	servers      Servers
+	serverMutex sync.Mutex
+	servers     Servers
 }
 
 func NewWatcher() *Watcher {