CPunch/gopenfusion
1
0
Fork 0
mirror of https://github.com/CPunch/gopenfusion.git synced 2025-11-10 09:30:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename cnpeer package to cnet

Browse Source
This commit is contained in:
CPunch
2023-12-01 17:11:41 -06:00
parent e1804a1042
commit c60017f78f
11 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
internal/service/service.go
View File

@@ -10,14 +10,14 @@ import (
"strconv"
"sync"
"github.com/CPunch/gopenfusion/cnpeer"
"github.com/CPunch/gopenfusion/cnet"
"github.com/CPunch/gopenfusion/config"
"github.com/CPunch/gopenfusion/internal/protocol"
)
type PacketHandler func(peer *cnpeer.CNPeer, pkt protocol.Packet) error
type PacketHandler func(peer *cnet.CNPeer, pkt protocol.Packet) error
func StubbedPacket(_ *cnpeer.CNPeer, _ protocol.Packet) error {
func StubbedPacket(_ *cnet.CNPeer, _ protocol.Packet) error {
return nil
}
@@ -29,18 +29,18 @@ type Service struct {
started chan struct{}
stopped chan struct{}
packetHandlers map[uint32]PacketHandler
peers map[chan *cnpeer.PacketEvent]*cnpeer.CNPeer
peers map[chan *cnet.PacketEvent]*cnet.CNPeer
stateLock sync.Mutex
// OnDisconnect is called when a peer disconnects from the service.
// uData is the stored value of the key/value pair in the peer map.
// It may not be set while the service is running. (eg. srvc.Start() has been called)
OnDisconnect func(peer *cnpeer.CNPeer)
OnDisconnect func(peer *cnet.CNPeer)
// OnConnect is called when a peer connects to the service.
// return value is used as the value in the peer map.
// It may not be set while the service is running. (eg. srvc.Start() has been called)
OnConnect func(peer *cnpeer.CNPeer)
OnConnect func(peer *cnet.CNPeer)
}
func RandomPort() (int, error) {
@@ -70,7 +70,7 @@ func NewService(ctx context.Context, name string, port int) *Service {
func (srvc *Service) Reset(ctx context.Context) {
srvc.ctx = ctx
srvc.packetHandlers = make(map[uint32]PacketHandler)
srvc.peers = make(map[chan *cnpeer.PacketEvent]*cnpeer.CNPeer)
srvc.peers = make(map[chan *cnet.PacketEvent]*cnet.CNPeer)
srvc.started = make(chan struct{})
srvc.stopped = make(chan struct{})
}
@@ -81,8 +81,8 @@ func (srvc *Service) AddPacketHandler(pktID uint32, handler PacketHandler) {
}
type newPeerConnection struct {
peer *cnpeer.CNPeer
channel chan *cnpeer.PacketEvent
peer *cnet.CNPeer
channel chan *cnet.PacketEvent
}
func (srvc *Service) Start() error {
@@ -113,22 +113,22 @@ func (srvc *Service) Start() error {
}
// create a new peer and pass it to the event loop
peer := cnpeer.NewCNPeer(srvc.ctx, conn)
eRecv := make(chan *cnpeer.PacketEvent)
peer := cnet.NewCNPeer(srvc.ctx, conn)
eRecv := make(chan *cnet.PacketEvent)
peerConnections <- newPeerConnection{channel: eRecv, peer: peer}
go peer.Handler(eRecv)
}
}
func (srvc *Service) getPeer(channel chan *cnpeer.PacketEvent) *cnpeer.CNPeer {
func (srvc *Service) getPeer(channel chan *cnet.PacketEvent) *cnet.CNPeer {
return srvc.peers[channel]
}
func (srvc *Service) setPeer(channel chan *cnpeer.PacketEvent, peer *cnpeer.CNPeer) {
func (srvc *Service) setPeer(channel chan *cnet.PacketEvent, peer *cnet.CNPeer) {
srvc.peers[channel] = peer
}
func (srvc *Service) removePeer(channel chan *cnpeer.PacketEvent) {
func (srvc *Service) removePeer(channel chan *cnet.PacketEvent) {
delete(srvc.peers, channel)
}
@@ -148,7 +148,7 @@ func (srvc *Service) Stopped() <-chan struct{} {
// if f returns false, the iteration is stopped.
// NOTE: the peer map is not locked while iterating, if you're calling this
// outside of the service's event loop, you'll need to lock the peer map yourself.
func (srvc *Service) RangePeers(f func(peer *cnpeer.CNPeer) bool) {
func (srvc *Service) RangePeers(f func(peer *cnet.CNPeer) bool) {
for _, peer := range srvc.peers {
if !f(peer) {
break
@@ -168,7 +168,7 @@ func (srvc *Service) Unlock() {
func (srvc *Service) stop() {
// OnDisconnect handler might need to do something important
srvc.RangePeers(func(peer *cnpeer.CNPeer) bool {
srvc.RangePeers(func(peer *cnet.CNPeer) bool {
peer.Kill()
if srvc.OnDisconnect != nil {
srvc.OnDisconnect(peer)
@@ -197,7 +197,7 @@ func (srvc *Service) handleEvents(peerPipe <-chan newPeerConnection) {
Chan: reflect.ValueOf(peerPipe),
})
addPoll := func(channel chan *cnpeer.PacketEvent) {
addPoll := func(channel chan *cnet.PacketEvent) {
poll = append(poll, reflect.SelectCase{
Dir: reflect.SelectRecv,
Chan: reflect.ValueOf(channel),
@@ -222,7 +222,7 @@ func (srvc *Service) handleEvents(peerPipe <-chan newPeerConnection) {
addPoll(evnt.channel)
srvc.connect(evnt.channel, evnt.peer)
default: // peer event
channel := poll[chosen].Chan.Interface().(chan *cnpeer.PacketEvent)
channel := poll[chosen].Chan.Interface().(chan *cnet.PacketEvent)
peer := srvc.getPeer(channel)
if peer == nil {
log.Printf("Unknown peer event: %v", value)
@@ -230,7 +230,7 @@ func (srvc *Service) handleEvents(peerPipe <-chan newPeerConnection) {
continue
}
evnt, ok := value.Interface().(*cnpeer.PacketEvent)
evnt, ok := value.Interface().(*cnet.PacketEvent)
if !recvOK || !ok || evnt == nil {
// peer disconnected, remove it from our poll queue
removePoll(chosen)
@@ -251,7 +251,7 @@ func (srvc *Service) handleEvents(peerPipe <-chan newPeerConnection) {
}
}
func (srvc *Service) handlePacket(peer *cnpeer.CNPeer, typeID uint32, pkt protocol.Packet) error {
func (srvc *Service) handlePacket(peer *cnet.CNPeer, typeID uint32, pkt protocol.Packet) error {
if hndlr, ok := srvc.packetHandlers[typeID]; ok {
// fmt.Printf("Handling packet %x\n", typeID)
if err := hndlr(peer, pkt); err != nil {
@@ -264,7 +264,7 @@ func (srvc *Service) handlePacket(peer *cnpeer.CNPeer, typeID uint32, pkt protoc
return nil
}
func (srvc *Service) disconnect(channel chan *cnpeer.PacketEvent, peer *cnpeer.CNPeer) {
func (srvc *Service) disconnect(channel chan *cnet.PacketEvent, peer *cnet.CNPeer) {
log.Printf("Peer %p disconnected from %s\n", peer, srvc.Name)
if srvc.OnDisconnect != nil {
srvc.OnDisconnect(peer)
@@ -273,7 +273,7 @@ func (srvc *Service) disconnect(channel chan *cnpeer.PacketEvent, peer *cnpeer.C
srvc.removePeer(channel)
}
func (srvc *Service) connect(channel chan *cnpeer.PacketEvent, peer *cnpeer.CNPeer) {
func (srvc *Service) connect(channel chan *cnet.PacketEvent, peer *cnet.CNPeer) {
log.Printf("New peer %p connected to %s\n", peer, srvc.Name)
if srvc.OnConnect != nil {
srvc.OnConnect(peer)

12
internal/service/service_test.go
View File

@@ -10,7 +10,7 @@ import (
"testing"
"time"
"github.com/CPunch/gopenfusion/cnpeer"
"github.com/CPunch/gopenfusion/cnet"
"github.com/CPunch/gopenfusion/internal/protocol"
"github.com/CPunch/gopenfusion/internal/service"
"github.com/matryer/is"
@@ -68,7 +68,7 @@ func TestService(t *testing.T) {
// our dummy packet handler
wg.Add(maxDummyPeers)
srvc.AddPacketHandler(0x1234, func(peer *cnpeer.CNPeer, pkt protocol.Packet) error {
srvc.AddPacketHandler(0x1234, func(peer *cnet.CNPeer, pkt protocol.Packet) error {
log.Printf("Received packet %#v", pkt)
wg.Done()
return nil
@@ -76,12 +76,12 @@ func TestService(t *testing.T) {
// wait for all dummy peers to connect and disconnect
wg.Add(maxDummyPeers)
srvc.OnConnect = func(peer *cnpeer.CNPeer) {
srvc.OnConnect = func(peer *cnet.CNPeer) {
wg.Done()
}
wg.Add(maxDummyPeers)
srvc.OnDisconnect = func(peer *cnpeer.CNPeer) {
srvc.OnDisconnect = func(peer *cnet.CNPeer) {
wg.Done()
}
@@ -96,7 +96,7 @@ func TestService(t *testing.T) {
conn, err := net.Dial("tcp", fmt.Sprintf("127.0.0.1:%d", srvcPort))
is.NoErr(err) // net.Dial error
peer := cnpeer.NewCNPeer(ctx, conn)
peer := cnet.NewCNPeer(ctx, conn)
go func() {
defer peer.Kill()
@@ -107,7 +107,7 @@ func TestService(t *testing.T) {
}()
// we wait until Handler gracefully exits (peer was killed)
peer.Handler(make(chan *cnpeer.PacketEvent))
peer.Handler(make(chan *cnet.PacketEvent))
wg.Done()
}()
}