bad/maeqtt
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Refactor connection and add support for resuming sessions

Browse source
This commit is contained in:
bad 2021-10-19 12:00:53 +02:00
parent 036552bac1
commit 09ac734b2d
6 changed files with 76 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
main.go
View file

@ -54,8 +54,10 @@ func handleConnection(con net.Conn, sessions map[string]*session.Session, rmSess
var sess *session.Session
if conReq.ConnectPakcet.ClientId != nil {
sess, exists := sessions[*conReq.ConnectPakcet.ClientId]
exists := false
sess, exists = sessions[*conReq.ConnectPakcet.ClientId]
if exists {
log.Printf("Resuming session %v", *sess.ClientID)
sess.ConnecionChannel <- conReq
}
}
@ -63,6 +65,8 @@ func handleConnection(con net.Conn, sessions map[string]*session.Session, rmSess
if sess == nil {
newSess := session.NewSession(conReq, rmSessChan)
sess = &newSess
sessions[*sess.ClientID] = sess
log.Printf("New session %v", *sess.ClientID)
go func() {
defer handlePanic(con)
sess.HandlerLoop()

47
session/Session.go
View file

@ -15,7 +15,6 @@ type Session struct {
SubscriptionChannel chan packets.PublishPacket
ConnecionChannel chan ConnectionRequest
freePacketID uint16
Expiry
@ -23,7 +22,9 @@ type Session struct {
func NewSession(req ConnectionRequest, rmSessChan RemoveSessionChannel) Session {
sess := Session{}
sess.SubscriptionChannel = make(chan packets.PublishPacket,)
sess.SubscriptionChannel = make(chan packets.PublishPacket)
sess.ConnecionChannel = make(chan ConnectionRequest)
sess.Expiry = NewExpiry(rmSessChan)
sess.Connect(req)
@ -31,21 +32,21 @@ func NewSession(req ConnectionRequest, rmSessChan RemoveSessionChannel) Session
}
func (s *Session) Connect(req ConnectionRequest) {
s.stopExpireTimer()
if s.Connection != nil {
s.Disconnect(packets.DisconnectReasonCodeSessionTakenOver)
}
connAck := packets.ConnackPacket{}
s.SetExpireTimer(req.ConnectPakcet.Properties.SessionExpiryInterval.Value)
s.expireTimer.Stop()
s.SetExpireTimerDuration(req.ConnectPakcet.Properties.SessionExpiryInterval.Value)
if req.ConnectPakcet.ClientId == nil {
if s.ClientID == nil {
s.ClientID = genClientID()
}
connAck.Properties.AssignedClientIdentifier.Value = s.ClientID
} else if s.ClientID != nil && s.ClientID != req.ConnectPakcet.ClientId {
} else if s.ClientID != nil && *s.ClientID != *req.ConnectPakcet.ClientId {
panic(fmt.Errorf("Session %s connect called with a connect packet with an ID: %s", *s.ClientID, *req.ConnectPakcet.ClientId))
} else {
s.ClientID = req.ConnectPakcet.ClientId
@ -59,24 +60,31 @@ func (s *Session) Connect(req ConnectionRequest) {
connAck.Properties.SharedSubscriptionAvailable.Value = &false
s.Connection = req.Connection
err := s.Connection.sendPacket(connAck)
if err != nil {
panic("TODO, handle this")
}
_ = s.Connection.sendPacket(connAck)
go s.Connection.PacketReadLoop()
}
// Starts a loop the receives and responds to packets
func (s *Session) HandlerLoop() {
go s.Connection.PacketReadLoop()
for s.Connection != nil {
for {
var packetChan chan packets.ClientPacket
if s.Connection != nil {
packetChan = s.Connection.PacketChannel
}
select {
case packet := <-s.Connection.PacketChannel:
case packet, more := <-packetChan:
if more {
packet.Visit(s)
case <-s.Connection.ClientDisconnectedChan:
} else {
s.onDisconnect()
}
case c := <-s.ConnecionChannel:
s.Connect(c)
case <-s.expiryChannel():
s.expireSession()
break
case subMessage := <-s.SubscriptionChannel:
if s.Connection != nil {
// TODO implement other qos levels
subMessage.QOSLevel = 0
subMessage.Dup = false
@ -86,19 +94,12 @@ func (s *Session) HandlerLoop() {
}
}
}
select {
case c := <-s.ConnecionChannel:
s.Connect(c)
// Tail recursion baybeeee
s.HandlerLoop()
case <- s.expireTimer.C:
s.expireSession()
}
}
func (s *Session) onDisconnect() {
s.Connection = nil
s.resetExpireTimer()
s.startExpireTimer()
log.Printf("Client disconnected, id: %s", *s.ClientID)
}

31
session/connection.go
View file

@ -5,7 +5,6 @@ import (
"errors"
"io"
"log"
"time"
"badat.dev/maeqtt/v2/mqtt/packets"
)
@ -18,47 +17,37 @@ type Connection struct {
WantsProblemInf bool
Will packets.Will
KeepAliveInterval time.Duration
keepAliveTicker time.Ticker
// TODO
//KeepAliveInterval time.Duration
//keepAliveTimer time.Timer
// Gets closed whenever the client disconnects
PacketChannel chan packets.ClientPacket
ClientDisconnectedChan chan bool
rw io.ReadWriteCloser
}
func (c *Connection) resetKeepAlive() {
if c.KeepAliveInterval != 0 {
panic("TODO")
// TODO IMPLEMENT THIS
//s.keepAliveTicker.Reset(s.KeepAliveInterval)
}
}
func (c *Connection) readPacket() (*packets.ClientPacket, error) {
return packets.ReadPacket(bufio.NewReader(c.rw))
}
func (c *Connection) sendPacket(p packets.ServerPacket) error {
c.resetKeepAlive()
return p.Write(c.rw)
}
func (c *Connection) close() error {
close(c.PacketChannel)
return c.rw.Close()
func (c *Connection) close() {
_ = c.rw.Close()
}
func (c *Connection) PacketReadLoop() {
for {
pack, err := c.readPacket()
if err != nil {
c.ClientDisconnectedChan <- true
c.close()
} else {
break
}
c.PacketChannel <- *pack
}
}
close(c.PacketChannel)
}
var FirstPackNotConnect error = errors.New("Failed to connect, first packet is not connect")
@ -103,8 +92,6 @@ func NewConnection(rw io.ReadWriteCloser) (ConnectionRequest, error) {
conn.WantsRespInf = false
}
conn.KeepAliveInterval = time.Duration(conPack.KeepAliveInterval) * time.Second
conn.PacketChannel = make(chan packets.ClientPacket, 1)
return connReq, err

29
session/expiry.go
View file

@ -1,6 +1,7 @@
package session
import (
"log"
"time"
"badat.dev/maeqtt/v2/subscription"
@ -8,7 +9,7 @@ import (
type Expiry struct {
ExpiryInterval time.Duration
expireTimer time.Timer
expireTimer *time.Timer
RemoveSessionChannel
}
@ -16,8 +17,6 @@ func NewExpiry(channel RemoveSessionChannel) Expiry {
expiry := Expiry{}
expiry.RemoveSessionChannel = channel
expiry.expireTimer = *time.NewTimer(time.Hour*9999)
expiry.expireTimer.Stop()
return expiry
}
@ -25,21 +24,37 @@ func NewExpiry(channel RemoveSessionChannel) Expiry {
type RemoveSessionChannel chan string
func (s *Session) expireSession() {
log.Printf("Session: %v expired", *s.ClientID)
subscription.Subscriptions.RemoveSubsForChannel(s.SubscriptionChannel)
s.RemoveSessionChannel <- *s.ClientID
}
// newTime is nullable
func (s *Session) SetExpireTimer(newTime *uint32) {
func (e *Expiry) SetExpireTimerDuration(newTime *uint32) {
expiry := uint32(0)
if newTime != nil {
expiry = *newTime
} else {
expiry = uint32(0)
}
s.ExpiryInterval = time.Duration(expiry) * time.Second
e.ExpiryInterval = time.Second * time.Duration(expiry)
}
func (s *Session) resetExpireTimer() {
s.expireTimer.Reset(s.ExpiryInterval)
func (e *Expiry) startExpireTimer() {
e.stopExpireTimer()
e.expireTimer = time.NewTimer(e.ExpiryInterval)
}
func (e *Expiry) stopExpireTimer() {
if e.expireTimer != nil {
e.expireTimer.Stop()
}
}
func (e *Expiry) expiryChannel() <- chan time.Time {
if e.expireTimer != nil {
return e.expireTimer.C
} else {
return nil
}
}

21
session/packetVisitors.go
View file

@ -1,7 +1,6 @@
package session
import (
"io"
"log"
"badat.dev/maeqtt/v2/mqtt/packets"
@ -31,10 +30,7 @@ func (s *Session) VisitPublish(p packets.PublishPacket) {
PacketID: *p.PacketId,
Reason: reason,
}
err := s.Connection.sendPacket(ack)
if err != nil {
panic("TODO")
}
_ = s.Connection.sendPacket(ack)
} else if p.QOSLevel == 2 {
panic("UNIMPLEMENTED QOS level 2")
}
@ -48,10 +44,7 @@ func (s *Session) VisitPublish(p packets.PublishPacket) {
}
func (s *Session) VisitDisconnect(p packets.DisconnectPacket) {
err := s.Connection.close()
if err != nil && err != io.ErrClosedPipe {
log.Println("Error closing connection", err)
}
s.Connection.close()
s.onDisconnect()
}
@ -59,26 +52,20 @@ func (s *Session) VisitSubscribe(p packets.SubscribePacket) {
for _, filter := range p.TopicFilters {
subscription.Subscriptions.Subscribe(filter, s.SubscriptionChannel)
}
err := s.Connection.sendPacket(packets.SubAckPacket{
_ = s.Connection.sendPacket(packets.SubAckPacket{
PacketID: p.PacketId,
Reason: packets.SubackReasonGrantedQoSTwo,
})
if err != nil {
panic("TODO")
}
}
func (s *Session) VisitUnsubscribe(p packets.UnsubscribePacket) {
for _, topic := range p.Topics {
subscription.Subscriptions.Unsubscribe(topic, s.SubscriptionChannel)
}
err := s.Connection.sendPacket(packets.UnsubAckPacket{
_ = s.Connection.sendPacket(packets.UnsubAckPacket{
PacketID: p.PacketID,
Reason: packets.UnsubackReasonSuccess,
})
if err != nil {
panic("TODO")
}
}
func (s *Session) VisitPing(p packets.PingreqPacket) {

2
session/utils.go
View file

@ -29,7 +29,7 @@ func (s *Session) Disconnect(code packets.DisconnectReasonCode) {
_ = s.Connection.sendPacket(packets.DisconnectPacket{
ReasonCode: code,
})
_ = s.Connection.close()
s.Connection.close()
s.onDisconnect()
}