mirror of
https://github.com/ergochat/ergo.git
synced 2025-12-21 10:31:59 -08:00
Make Message an interface with attached handling behavior.
This commit is contained in:
parent
d1f8c7657b
commit
fed72a7aa3
6 changed files with 190 additions and 96 deletions
|
|
@ -7,18 +7,23 @@ import (
|
|||
"net"
|
||||
)
|
||||
|
||||
func readTrimmedLine(reader *bufio.Reader) (string, error) {
|
||||
line, err := reader.ReadString('\n')
|
||||
return strings.TrimSpace(line), err
|
||||
}
|
||||
|
||||
// Adapt `net.Conn` to a `chan string`.
|
||||
func StringReadChan(conn net.Conn) chan string {
|
||||
func StringReadChan(conn net.Conn) <-chan string {
|
||||
ch := make(chan string)
|
||||
reader := bufio.NewReader(conn)
|
||||
go func() {
|
||||
for {
|
||||
line, err := reader.ReadString('\n')
|
||||
line, err := readTrimmedLine(reader)
|
||||
if (line != "") {
|
||||
ch <- strings.TrimSpace(line)
|
||||
ch <- line
|
||||
log.Printf("%s -> %s", conn.RemoteAddr(), line)
|
||||
}
|
||||
if err != nil {
|
||||
log.Print("StringReadChan[read]: ", err)
|
||||
break
|
||||
}
|
||||
}
|
||||
|
|
@ -27,16 +32,16 @@ func StringReadChan(conn net.Conn) chan string {
|
|||
return ch
|
||||
}
|
||||
|
||||
func StringWriteChan(conn net.Conn) chan string {
|
||||
func StringWriteChan(conn net.Conn) chan<- string {
|
||||
ch := make(chan string)
|
||||
writer := bufio.NewWriter(conn)
|
||||
go func() {
|
||||
for str := range ch {
|
||||
if _, err := writer.WriteString(str + "\r\n"); err != nil {
|
||||
log.Print("StringWriteChan[write]: ", err)
|
||||
break
|
||||
}
|
||||
writer.Flush()
|
||||
log.Printf("%s <- %s", conn.RemoteAddr(), str)
|
||||
}
|
||||
close(ch)
|
||||
}()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue