sad/soju
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Plumb context in downstreamConn.handleMessageRegistered

Browse Source 
References: https://todo.sr.ht/~emersion/soju/141
This commit is contained in:
Simon Ser 2021-11-08 18:11:24 +01:00
parent 659083c781
commit 8b3e5e7465
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
downstream.go
View File

@ -1335,7 +1335,7 @@ func (dc *downstreamConn) sendTargetBacklog(net *network, target, msgID string)
ch := net.channels.Value(target) ch := net.channels.Value(target)
ctx, cancel := context.WithTimeout(context.TODO(), messageStoreTimeout) ctx, cancel := context.WithTimeout(context.TODO(), backlogTimeout)
defer cancel() defer cancel()
targetCM := net.casemap(target) targetCM := net.casemap(target)
@ -1393,6 +1393,9 @@ func (dc *downstreamConn) runUntilRegistered() error {
} }
func (dc *downstreamConn) handleMessageRegistered(msg *irc.Message) error { func (dc *downstreamConn) handleMessageRegistered(msg *irc.Message) error {
ctx, cancel := context.WithTimeout(context.TODO(), handleDownstreamMessageTimeout)
defer cancel()
switch msg.Command { switch msg.Command {
case "CAP": case "CAP":
var subCmd string var subCmd string
@ -1468,7 +1471,7 @@ func (dc *downstreamConn) handleMessageRegistered(msg *irc.Message) error {
return return
} }
n.Nick = nick n.Nick = nick
err = dc.srv.db.StoreNetwork(context.TODO(), dc.user.ID, &n.Network) err = dc.srv.db.StoreNetwork(ctx, dc.user.ID, &n.Network)
}) })
if err != nil { if err != nil {
return err return err
@ -1518,7 +1521,7 @@ func (dc *downstreamConn) handleMessageRegistered(msg *irc.Message) error {
}) })
n.Realname = storeRealname n.Realname = storeRealname
if err := dc.srv.db.StoreNetwork(context.TODO(), dc.user.ID, &n.Network); err != nil { if err := dc.srv.db.StoreNetwork(ctx, dc.user.ID, &n.Network); err != nil {
dc.logger.Printf("failed to store network realname: %v", err) dc.logger.Printf("failed to store network realname: %v", err)
storeErr = err storeErr = err
} }
@ -1607,7 +1610,7 @@ func (dc *downstreamConn) handleMessageRegistered(msg *irc.Message) error {
} }
uc.network.channels.SetValue(upstreamName, ch) uc.network.channels.SetValue(upstreamName, ch)
} }
if err := dc.srv.db.StoreChannel(context.TODO(), uc.network.ID, ch); err != nil { if err := dc.srv.db.StoreChannel(ctx, uc.network.ID, ch); err != nil {
dc.logger.Printf("failed to create or update channel %q: %v", upstreamName, err) dc.logger.Printf("failed to create or update channel %q: %v", upstreamName, err)
} }
} }
@ -1639,7 +1642,7 @@ func (dc *downstreamConn) handleMessageRegistered(msg *irc.Message) error {
} }
uc.network.channels.SetValue(upstreamName, ch) uc.network.channels.SetValue(upstreamName, ch)
} }
if err := dc.srv.db.StoreChannel(context.TODO(), uc.network.ID, ch); err != nil { if err := dc.srv.db.StoreChannel(ctx, uc.network.ID, ch); err != nil {
dc.logger.Printf("failed to create or update channel %q: %v", upstreamName, err) dc.logger.Printf("failed to create or update channel %q: %v", upstreamName, err)
} }
} else { } else {
@ -2168,7 +2171,7 @@ func (dc *downstreamConn) handleMessageRegistered(msg *irc.Message) error {
} }
if msg.Command == "PRIVMSG" && uc.network.casemap(upstreamName) == "nickserv" { if msg.Command == "PRIVMSG" && uc.network.casemap(upstreamName) == "nickserv" {
dc.handleNickServPRIVMSG(uc, text) dc.handleNickServPRIVMSG(ctx, uc, text)
} }
unmarshaledText := text unmarshaledText := text
@ -2343,9 +2346,6 @@ func (dc *downstreamConn) handleMessageRegistered(msg *irc.Message) error {
eventPlayback := dc.caps["draft/event-playback"] eventPlayback := dc.caps["draft/event-playback"]
ctx, cancel := context.WithTimeout(context.TODO(), messageStoreTimeout)
defer cancel()
var history []*irc.Message var history []*irc.Message
switch subcommand { switch subcommand {
case "BEFORE": case "BEFORE":
@ -2545,7 +2545,7 @@ func (dc *downstreamConn) handleMessageRegistered(msg *irc.Message) error {
return nil return nil
} }
func (dc *downstreamConn) handleNickServPRIVMSG(uc *upstreamConn, text string) { func (dc *downstreamConn) handleNickServPRIVMSG(ctx context.Context, uc *upstreamConn, text string) {
username, password, ok := parseNickServCredentials(text, uc.nick) username, password, ok := parseNickServCredentials(text, uc.nick)
if !ok { if !ok {
return return
@ -2562,7 +2562,7 @@ func (dc *downstreamConn) handleNickServPRIVMSG(uc *upstreamConn, text string) {
n.SASL.Mechanism = "PLAIN" n.SASL.Mechanism = "PLAIN"
n.SASL.Plain.Username = username n.SASL.Plain.Username = username
n.SASL.Plain.Password = password n.SASL.Plain.Password = password
if err := dc.srv.db.StoreNetwork(context.TODO(), dc.user.ID, &n.Network); err != nil { if err := dc.srv.db.StoreNetwork(ctx, dc.user.ID, &n.Network); err != nil {
dc.logger.Printf("failed to save NickServ credentials: %v", err) dc.logger.Printf("failed to save NickServ credentials: %v", err)
} }
} }

3
server.go
View File

@ -25,7 +25,8 @@ var connectTimeout = 15 * time.Second
var writeTimeout = 10 * time.Second var writeTimeout = 10 * time.Second
var upstreamMessageDelay = 2 * time.Second var upstreamMessageDelay = 2 * time.Second
var upstreamMessageBurst = 10 var upstreamMessageBurst = 10
var messageStoreTimeout = 10 * time.Second var backlogTimeout = 10 * time.Second
var handleDownstreamMessageTimeout = 10 * time.Second
var chatHistoryLimit = 1000 var chatHistoryLimit = 1000
var backlogLimit = 4000 var backlogLimit = 4000