gisle/irc
1
0
Fork 0
mirror of https://github.com/gissleh/irc.git synced 2026-10-15 19:42:54 +00:00
Code Issues Releases Wiki Activity

add more error events, add write deadline and make more client functionality use the non-blocking emit..
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
gisle
2020-07-20 21:11:44 +02:00
parent 512ba5aa6f
commit af5dc31ff3
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client.go
+12 -7
View File
@@ -221,7 +221,7 @@ func (client *Client) Connect(addr string, ssl bool) (err error) {
client.quit = false client.quit = false
client.mutex.Unlock() client.mutex.Unlock()
_ = client.EmitSync(context.Background(), NewEvent("client", "connecting")) client.EmitNonBlocking(NewEvent("client", "connecting"))
if ssl { if ssl {
conn, err = tls.Dial("tcp", addr, &tls.Config{ conn, err = tls.Dial("tcp", addr, &tls.Config{
@@ -237,7 +237,7 @@ func (client *Client) Connect(addr string, ssl bool) (err error) {
} }
} }
client.Emit(NewEvent("client", "connect")) client.EmitNonBlocking(NewEvent("client", "connect"))
go func() { go func() {
reader := bufio.NewReader(conn) reader := bufio.NewReader(conn)
@@ -246,16 +246,18 @@ func (client *Client) Connect(addr string, ssl bool) (err error) {
for { for {
line, err := reader.ReadString('\n') line, err := reader.ReadString('\n')
if err != nil { if err != nil {
client.EmitNonBlocking(NewErrorEvent("read", "Read failed: " + err.Error()))
break break
} }
line = replacer.Replace(line) line = replacer.Replace(line)
event, err := ParsePacket(line) event, err := ParsePacket(line)
if err != nil { if err != nil {
client.EmitNonBlocking(NewErrorEvent("parse", "Read failed: " + err.Error()))
continue continue
} }
client.Emit(event) client.EmitNonBlocking(event)
} }
client.mutex.Lock() client.mutex.Lock()
@@ -263,7 +265,7 @@ func (client *Client) Connect(addr string, ssl bool) (err error) {
client.ready = false client.ready = false
client.mutex.Unlock() client.mutex.Unlock()
client.Emit(NewEvent("client", "disconnect")) client.EmitNonBlocking(NewEvent("client", "disconnect"))
}() }()
client.mutex.Lock() client.mutex.Lock()
@@ -297,7 +299,8 @@ func (client *Client) Connected() bool {
} }
// Send sends a line to the server. A line-feed will be automatically added if one // Send sends a line to the server. A line-feed will be automatically added if one
// is not provided. // is not provided. If this isn't part of early registration, SendQueued might save
// you from a potential flood kick.
func (client *Client) Send(line string) error { func (client *Client) Send(line string) error {
client.mutex.RLock() client.mutex.RLock()
conn := client.conn conn := client.conn
@@ -311,16 +314,18 @@ func (client *Client) Send(line string) error {
line += "\r\n" line += "\r\n"
} }
_ = conn.SetWriteDeadline(time.Now().Add(time.Second * 30))
_, err := conn.Write([]byte(line)) _, err := conn.Write([]byte(line))
if err != nil { if err != nil {
client.EmitNonBlocking(NewErrorEvent("network", err.Error())) client.EmitNonBlocking(NewErrorEvent("write", err.Error()))
_ = client.Disconnect() _ = client.Disconnect()
} }
return err return err
} }
// Sendf is Send with a fmt.Sprintf // Sendf is Send with a fmt.Sprintf. If this isn't part of early registration,
// SendQueuedf might save you from a potential flood kick.
func (client *Client) Sendf(format string, a ...interface{}) error { func (client *Client) Sendf(format string, a ...interface{}) error {
return client.Send(fmt.Sprintf(format, a...)) return client.Send(fmt.Sprintf(format, a...))
} }