X-Git-Url: https://git.martlubbers.net/?p=cloogle-irc.git;a=blobdiff_plain;f=IRCBot.icl;h=3b620907b73267a47b952bb817c44614251a40b9;hp=9b6b32073e0882c067d294ac9eb90c747c7fbcb9;hb=e81450dc6e427524ac74160cc9d54b1d8fb40cba;hpb=3134ab7e61bcbc84560b4a5d613a92b1a48362c2

diff --git a/IRCBot.icl b/IRCBot.icl
index 9b6b320..3b62090 100644
--- a/IRCBot.icl
+++ b/IRCBot.icl
@@ -7,61 +7,69 @@ import Data.Maybe
 import IRC
 import TCPIP
 
-from Text import class Text(join), instance Text String
+from Text import class Text(split,join), instance Text String
 
 import StdList
 import StdBool
 
 TIMEOUT :== Just 1000
 
-bot :: (String, Int) [IRCMessage] [IRCMessage] a (IRCMessage a *World -> (Maybe [IRCMessage], a, *World)) *World -> (MaybeErrorString a, *World)
+bot :: (String, Int) [IRCMessage] [IRCMessage] .a (IRCMessage -> (.a -> .(*World -> *(Maybe [IRCMessage], .a, *World)))) *World -> *(Maybe String, .a, *World)
 bot (host, port) start end state bot w
 //Lookup hostname
 # (ip, w) = lookupIPAddress host w
-| isNothing ip = (Error $ "DNS lookup for " +++ host +++ " failed", w)
+| isNothing ip
+	= (Just $ "DNS lookup for " +++ host +++ " failed", state, w)
 //Connect
 # (rpt,chan,w) = connectTCP_MT TIMEOUT (fromJust ip, port) w
-| rpt == TR_Expired = (Error $ "Connection to " +++ host +++ " timed out", w)
-| rpt == TR_NoSuccess = (Error $ "Could not connect to " +++ host, w)
+| rpt == TR_Expired
+	= (Just $ "Connection to " +++ host +++ " timed out", state, w)
+| rpt == TR_NoSuccess
+	= (Just $ "Could not connect to " +++ host, state, w)
 // Send startup commands
 # (merr, chan, w) = send (map toString start) (fromJust chan) w
-| isError merr = (Error $ fromError merr, w)
+| isError merr = (Just $ fromError merr, state, w)
 //Start processing function
-# (mer, chan, state, w) = process chan state bot w
-| isError mer = (Error $ fromError mer, w)
+# (mer, chan, state, w) = process chan "" state bot w
+| isError mer = (Just $ fromError mer, state, w)
 // Send shutdown commands
 # (merr, {rChannel,sChannel}, w) = send (map toString end) chan w
-| isError merr = (Error $ fromError merr, w)
+| isError merr = (Just $ fromError merr, state, w)
 //Close channels
-= (Ok state, closeChannel sChannel (closeRChannel rChannel w))
+= (Nothing, state, closeChannel sChannel (closeRChannel rChannel w))
 
-import StdDebug,StdMisc
-process :: TCP_DuplexChannel a (IRCMessage a *World -> (Maybe [IRCMessage], a, *World)) *World -> (MaybeErrorString (), TCP_DuplexChannel, a, *World)
-process chan state bot w
-//Receive
-# (merr_resp, chan, w) = recv chan w
-| isError merr_resp = (Error (fromError merr_resp), chan, state, w)
-# (Ok mresp) = merr_resp
-| isNothing mresp = process chan state bot w
-| not (trace_tn $ "Received: " +++ fromJust mresp) = undef
-//Process
-= case parseIRCMessage (fromJust mresp) of
-	(Left err) = (Error $ "IRC Parsing error: " +++ join "\n" err, chan, state, w)
-	(Right msg)
-	# (mircc, state, w) = bot msg state w
-	| isNothing mircc = (Ok (), chan, state, w) // Bot asks to quit
-	//Possible send the commands
-	# (merr, chan, w) = send (map toString $ fromJust mircc) chan w
-	| isError merr = (Error $ fromError merr, chan, state, w)
-	//Recurse
-	= process chan state bot w
+process :: TCP_DuplexChannel String .a (IRCMessage -> (.a -> .(*World -> *(Maybe [IRCMessage], .a, *World)))) *World -> (MaybeErrorString (), TCP_DuplexChannel, .a, *World)
+process chan acc state bot w
+//See if we have a message
+= case split "\r\n" acc of
+	//We only have one message that is not complete
+	[m] 
+		//Receive
+		# (merr_resp, chan, w) = recv chan w
+		| isError merr_resp = (Error (fromError merr_resp), chan, state, w)
+		# (Ok mresp) = merr_resp
+		| isNothing mresp = process chan acc state bot w
+		= process chan (m +++ fromJust mresp) state bot w
+	//We have a successfull split and therefore we process at least one message
+	[m:xs]
+		# acc = join "\r\n" xs
+		= case parseIRCMessage $ m +++ "\r\n" of
+			(Left err) = (Error $ "IRC Parsing error: " +++ join "\n" err, chan, state, w)
+			(Right msg)
+			# (mircc, state, w) = bot msg state w
+			| isNothing mircc = (Ok (), chan, state, w) // Bot asks to quit
+			//Possible send the commands
+			# (merr, chan, w) = send (map toString $ fromJust mircc) chan w
+			| isError merr = (Error $ fromError merr, chan, state, w)
+			//Recurse
+			= process chan acc state bot w
 
-send :: [String] TCP_DuplexChannel *World -> (MaybeErrorString (), TCP_DuplexChannel, *World)
+send :: ![String] !TCP_DuplexChannel !*World -> (!MaybeErrorString (), !TCP_DuplexChannel, !*World)
 send [] chan w = (Ok (), chan, w)
 send [msg:msgs] {sChannel,rChannel} w
-# (_, w) = sleep 250000 w
 # (rpt,i,sChannel,w) = send_MT TIMEOUT (toByteSeq msg) sChannel w
 | rpt <> TR_Success = (Error "Could not send message", {sChannel=sChannel,rChannel=rChannel}, w)
+# (_, w) = sleep 500000 w
 = send msgs {sChannel=sChannel,rChannel=rChannel} w
 	where
 		sleep :: !Int !*World -> (!Int, *World)