Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

don't issue a send() when the socket is unready #10

Merged
merged 2 commits into from Oct 13, 2019
Merged

don't issue a send() when the socket is unready #10

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4b699c
fix warnings, don't send() in connecting/disconn
disruptek Jul 12, 2019
f78e1f9
Merge branch 'master' into ircgreen
disruptek Oct 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 18 additions & 20 deletions src/irc.nim
View file
Open in desktop
Expand Up @@ -142,10 +142,10 @@ proc send*(irc: AsyncIrc, message: string,
## quickly to prevent excessive flooding of the IRC server. You can prevent
## buffering by specifying ``True`` for the ``sendImmediately`` param.
if wasBuffered(irc, message, sendImmediately):
result = irc.sock.send(message & "\c\L")
else:
result = newFuture[void]("irc.send")
result.complete()
if irc.status notin [SockClosed, SockConnecting]:
disruptek marked this conversation as resolved.
Show resolved Hide resolved
return irc.sock.send(message & "\c\L")
result = newFuture[void]("irc.send")
result.complete()

proc privmsg*(irc: Irc, target, message: string) =
## Sends ``message`` to ``target``. ``Target`` can be a channel, or a user.
Expand Down Expand Up @@ -207,9 +207,9 @@ proc isNumber(s: string): bool =
result = i == s.len and s.len > 0

proc parseMessage(msg: string): IrcEvent =
result.typ = EvMsg
result = IrcEvent(typ: EvMsg)
result.cmd = MUnknown
result.tags = newStringTable()
result.tags = newStringTable()
result.raw = msg
result.timestamp = times.getTime()
var i = 0
Expand Down Expand Up @@ -285,8 +285,8 @@ proc connect*(irc: Irc) =
assert(irc.address != "")
assert(irc.port != Port(0))

irc.status = SockConnecting
irc.sock.connect(irc.address, irc.port)

irc.status = SockConnected

# Greet the server :)
Expand Down Expand Up @@ -345,14 +345,14 @@ proc addNick(irc: Irc | AsyncIrc, chan, nick: string) =
## Adds ``nick`` to ``chan``'s user list.
var stripped = nick
# Strip common nick prefixes
if nick[0] in {'+', '@', '%', '!', '&', '~'}: stripped = nick[1 .. <nick.len]
if nick[0] in {'+', '@', '%', '!', '&', '~'}: stripped = nick[1 ..< nick.len]

irc.userList[chan].list.add(stripped)

proc processLine(irc: Irc | AsyncIrc, line: string): IrcEvent =
if line.len == 0:
irc.close()
result.typ = EvDisconnected
result = IrcEvent(typ: EvDisconnected)
else:
result = parseMessage(line)
# Get the origin
Expand All @@ -362,7 +362,7 @@ proc processLine(irc: Irc | AsyncIrc, line: string): IrcEvent =

if result.cmd == MError:
irc.close()
result.typ = EvDisconnected
result = IrcEvent(typ: EvDisconnected)
return

if result.cmd == MPong:
Expand Down Expand Up @@ -430,9 +430,7 @@ proc handleLineEvents(irc: Irc | AsyncIrc, ev: IrcEvent) {.multisync.} =
await irc.join(chan)

# Emit connected event.
var ev = IrcEvent(
typ: EvConnected
)
var ev = IrcEvent(typ: EvConnected)
when irc is IRC:
irc.eventsQueue.addLast(ev)
else:
Expand All @@ -446,7 +444,7 @@ proc processOther(irc: Irc, ev: var IrcEvent): bool =

if epochTime() - irc.lastPong >= 120.0 and irc.lastPong != -1.0:
irc.close()
ev.typ = EvTimeout
ev = IrcEvent(typ: EvTimeout)
return true

for i in 0..irc.messageBuffer.len-1:
Expand All @@ -467,8 +465,7 @@ proc processOtherForever(irc: AsyncIrc) {.async.} =

if epochTime() - irc.lastPong >= 120.0 and irc.lastPong != -1.0:
irc.close()
var ev: IrcEvent
ev.typ = EvTimeout
var ev = IrcEvent(typ: EvTimeout)
asyncCheck irc.handleEvent(irc, ev)

for i in 0..irc.messageBuffer.len-1:
Expand Down Expand Up @@ -498,7 +495,8 @@ proc poll*(irc: Irc, ev: var IrcEvent,

if not (irc.status == SockConnected):
# Do not close the socket here, it is already closed!
ev.typ = EvDisconnected
ev = IrcEvent(typ: EvDisconnected)

var line = TaintedString""
try:
irc.sock.readLine(line, timeout)
Expand Down Expand Up @@ -536,14 +534,14 @@ proc connect*(irc: AsyncIrc) {.async.} =
## to this procedure.
assert(irc.address != "")
assert(irc.port != Port(0))
irc.status = SockConnecting

irc.status = SockConnecting
await irc.sock.connect(irc.address, irc.port)
irc.status = SockConnected

if irc.serverPass != "": await irc.send("PASS " & irc.serverPass, true)
await irc.send("NICK " & irc.nick, true)
await irc.send("USER $1 * 0 :$2" % [irc.user, irc.realname], true)
irc.status = SockConnected

proc reconnect*(irc: AsyncIrc, timeout = 5000) {.async.} =
## Reconnects to an IRC server.
Expand Down Expand Up @@ -611,7 +609,7 @@ proc run*(irc: AsyncIrc) {.async.} =
while true:
if irc.status == SockConnected:
var line = await irc.sock.recvLine()
var ev = irc.processLine(line.string)
var ev = irc.processLine(line)
await irc.handleLineEvents(ev)
asyncCheck irc.handleEvent(irc, ev)
else:
Expand Down