summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--internal/api/handlers/handlers.go4
-rw-r--r--pkg/p2p/ip.go (renamed from internal/network/ip.go)2
-rw-r--r--pkg/p2p/network.go (renamed from internal/network/network.go)2
-rw-r--r--pkg/p2p/network_test.go (renamed from internal/network/network_test.go)2
-rw-r--r--pkg/p2p/session.go (renamed from internal/network/session.go)2
-rw-r--r--pkg/ui/multiplayer/multiplayer.go24
-rw-r--r--pkg/ui/views/game_moves.go4
-rw-r--r--pkg/ui/views/play_api.go12
8 files changed, 26 insertions, 26 deletions
diff --git a/internal/api/handlers/handlers.go b/internal/api/handlers/handlers.go
index 6d1b4e3..c8b7425 100644
--- a/internal/api/handlers/handlers.go
+++ b/internal/api/handlers/handlers.go
@@ -9,7 +9,7 @@ import (
"github.com/boozec/rahanna/internal/api/auth"
"github.com/boozec/rahanna/internal/api/database"
"github.com/boozec/rahanna/internal/logger"
- "github.com/boozec/rahanna/internal/network"
+ "github.com/boozec/rahanna/pkg/p2p"
"github.com/gorilla/mux"
"gorm.io/gorm"
)
@@ -116,7 +116,7 @@ func NewPlay(w http.ResponseWriter, r *http.Request) {
db, _ := database.GetDb()
- name := network.NewSession()
+ name := p2p.NewSession()
play := database.Game{
Player1ID: claims.UserID,
Player2ID: nil,
diff --git a/internal/network/ip.go b/pkg/p2p/ip.go
index ec1e984..c82b861 100644
--- a/internal/network/ip.go
+++ b/pkg/p2p/ip.go
@@ -1,4 +1,4 @@
-package network
+package p2p
import (
"fmt"
diff --git a/internal/network/network.go b/pkg/p2p/network.go
index cec024f..3362b4a 100644
--- a/internal/network/network.go
+++ b/pkg/p2p/network.go
@@ -1,4 +1,4 @@
-package network
+package p2p
import (
"bufio"
diff --git a/internal/network/network_test.go b/pkg/p2p/network_test.go
index 1bc42fb..faad9d4 100644
--- a/internal/network/network_test.go
+++ b/pkg/p2p/network_test.go
@@ -1,4 +1,4 @@
-package network
+package p2p
import (
"testing"
diff --git a/internal/network/session.go b/pkg/p2p/session.go
index a4f60aa..5d7ab52 100644
--- a/internal/network/session.go
+++ b/pkg/p2p/session.go
@@ -1,4 +1,4 @@
-package network
+package p2p
import (
"math/rand"
diff --git a/pkg/ui/multiplayer/multiplayer.go b/pkg/ui/multiplayer/multiplayer.go
index c9fc4b2..0e390eb 100644
--- a/pkg/ui/multiplayer/multiplayer.go
+++ b/pkg/ui/multiplayer/multiplayer.go
@@ -3,36 +3,36 @@ package multiplayer
import (
"time"
- "github.com/boozec/rahanna/internal/network"
+ "github.com/boozec/rahanna/pkg/p2p"
"go.uber.org/zap"
)
type GameNetwork struct {
- server *network.TCPNetwork
- me network.NetworkID
- peer network.NetworkID
+ server *p2p.TCPNetwork
+ me p2p.NetworkID
+ peer p2p.NetworkID
}
// Wrapper to a `TCPNetwork`
-func NewGameNetwork(localID string, address string, onHandshake network.NetworkHandshakeFunc, logger *zap.Logger) *GameNetwork {
- opts := network.TCPNetworkOpts{
+func NewGameNetwork(localID string, address string, onHandshake p2p.NetworkHandshakeFunc, logger *zap.Logger) *GameNetwork {
+ opts := p2p.TCPNetworkOpts{
ListenAddr: address,
HandshakeFn: onHandshake,
RetryDelay: time.Second * 2,
Logger: logger,
}
- server := network.NewTCPNetwork(network.NetworkID(localID), opts)
+ server := p2p.NewTCPNetwork(p2p.NetworkID(localID), opts)
return &GameNetwork{
server: server,
- me: network.NetworkID(localID),
+ me: p2p.NetworkID(localID),
}
}
-func (n *GameNetwork) Peer() network.NetworkID {
+func (n *GameNetwork) Peer() p2p.NetworkID {
return n.peer
}
-func (n *GameNetwork) Me() network.NetworkID {
+func (n *GameNetwork) Me() p2p.NetworkID {
return n.me
}
@@ -40,11 +40,11 @@ func (n *GameNetwork) Send(payload []byte) error {
return n.server.Send(n.peer, payload)
}
-func (n *GameNetwork) AddPeer(remoteID network.NetworkID, addr string) {
+func (n *GameNetwork) AddPeer(remoteID p2p.NetworkID, addr string) {
n.peer = remoteID
n.server.AddPeer(remoteID, addr)
}
-func (n *GameNetwork) AddReceiveFunction(f network.NetworkMessageReceiveFunc) {
+func (n *GameNetwork) AddReceiveFunction(f p2p.NetworkMessageReceiveFunc) {
n.server.OnReceiveFn = f
}
diff --git a/pkg/ui/views/game_moves.go b/pkg/ui/views/game_moves.go
index eeee9e1..daf24e6 100644
--- a/pkg/ui/views/game_moves.go
+++ b/pkg/ui/views/game_moves.go
@@ -3,7 +3,7 @@ package views
import (
"fmt"
- "github.com/boozec/rahanna/internal/network"
+ "github.com/boozec/rahanna/pkg/p2p"
"github.com/charmbracelet/bubbles/list"
tea "github.com/charmbracelet/bubbletea"
"github.com/notnil/chess"
@@ -24,7 +24,7 @@ func (i item) Description() string { return "" }
func (i item) FilterValue() string { return i.title }
func (m *GameModel) getMoves() tea.Cmd {
- m.network.AddReceiveFunction(func(msg network.Message) {
+ m.network.AddReceiveFunction(func(msg p2p.Message) {
payload := string(msg.Payload)
m.incomingMoves <- payload
})
diff --git a/pkg/ui/views/play_api.go b/pkg/ui/views/play_api.go
index 40f26a8..d65dca9 100644
--- a/pkg/ui/views/play_api.go
+++ b/pkg/ui/views/play_api.go
@@ -10,7 +10,7 @@ import (
"github.com/boozec/rahanna/internal/api/database"
"github.com/boozec/rahanna/internal/logger"
- "github.com/boozec/rahanna/internal/network"
+ "github.com/boozec/rahanna/pkg/p2p"
"github.com/boozec/rahanna/pkg/ui/multiplayer"
tea "github.com/charmbracelet/bubbletea"
)
@@ -68,7 +68,7 @@ func (m *PlayModel) handleGameResponse(msg database.Game) (tea.Model, tea.Cmd) {
localPort, _ := strconv.ParseInt(ip[1], 10, 32)
logger, _ := logger.GetLogger()
- network := multiplayer.NewGameNetwork("peer-2", fmt.Sprintf("%s:%d", localIP, localPort), network.DefaultHandshake, logger)
+ network := multiplayer.NewGameNetwork("peer-2", fmt.Sprintf("%s:%d", localIP, localPort), p2p.DefaultHandshake, logger)
return m, SwitchModelCmd(NewGameModel(m.width, m.height+1, m.game.ID, network))
}
@@ -92,12 +92,12 @@ func (m *PlayModel) newGameCallback() tea.Cmd {
}
// Set up network connection
- port, err := network.GetRandomAvailablePort()
+ port, err := p2p.GetRandomAvailablePort()
if err != nil {
return playResponse{Error: err.Error()}
}
- ip := network.GetOutboundIP().String()
+ ip := p2p.GetOutboundIP().String()
// FIXME: ip
ip = "0.0.0.0"
@@ -149,12 +149,12 @@ func (m PlayModel) enterGame() tea.Cmd {
}
// Set up network connection
- port, err := network.GetRandomAvailablePort()
+ port, err := p2p.GetRandomAvailablePort()
if err != nil {
return playResponse{Error: err.Error()}
}
- ip := network.GetOutboundIP().String()
+ ip := p2p.GetOutboundIP().String()
// FIXME: ip
ip = "0.0.0.0"
generated by cgit v1.2.3-18-g5258 (git 2.32.0) at 2025-06-13 21:42:58 +0000