X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Devices%2FmTaskTCP.icl;h=5373d50a2e98b450ec7a106b382f374580fd33f0;hb=3fe035b92e9bc0b745c57db64e78461b2f36b6d1;hp=52832d6778a8e6d7fb50ef619d5ed8516dac2bd5;hpb=1827e72942a355fc90dcb4e0b93f68c98dc6eea5;p=mTask.git

diff --git a/Devices/mTaskTCP.icl b/Devices/mTaskTCP.icl
index 52832d6..5373d50 100644
--- a/Devices/mTaskTCP.icl
+++ b/Devices/mTaskTCP.icl
@@ -14,32 +14,51 @@ derive gPrint MTaskMSGRecv
 getmTaskTCPDevice :: Task MTaskResource
 getmTaskTCPDevice = TCPDevice <$> enterInformation "Settings" []
 
+:: ChD :== ([MTaskMSGRecv], [MTaskMSGSend], Bool)
+
 instance MTaskDuplex TCPSettings where
 	synFun :: TCPSettings (Shared Channels) -> Task ()
-	synFun s channels =
-		tcpconnect s.host s.port channels {ConnectionHandlers|
+	synFun s channels
+	| not (trace_tn "synFun started") = undef
+	= tcpconnect s.host s.port channels {ConnectionHandlers|
 				onConnect=onConnect,
-				whileConnected=whileConnected,
-				onDisconnect=onDisconnect} @! ()
+				onData=onData,
+				onShareChange=onShareChange,
+				onDisconnect=onDisconnect}
+				>>| throw "Device disconnected"
 		where
-			onConnect :: String ([MTaskMSGRecv],[MTaskMSGSend],Bool) -> (MaybeErrorString String, Maybe ([MTaskMSGRecv],[MTaskMSGSend],Bool), [String], Bool)
-			onConnect acc (msgs,send,sendStopped) = (Ok acc, Just (msgs,[],sendStopped), map encode send, False)
-
-			whileConnected :: (Maybe String) String ([MTaskMSGRecv], [MTaskMSGSend],Bool) -> (MaybeErrorString String, Maybe ([MTaskMSGRecv],[MTaskMSGSend],Bool), [String], Bool)
-			//We stop
-			whileConnected _ _ (_,_,True) = (Ok "", Nothing, [], True)
-			//No new data and nothing to send
-			whileConnected Nothing acc (_,[],_) = (Ok acc, Nothing, [], False)
-			//New data and possibly something to send
-			whileConnected newdata acc (msgs,send,sendStopped)
-			# (acc, nd) = process (acc +++ fromMaybe "" newdata)
-			| isEmpty nd && isEmpty send = (Ok acc, Nothing, [], False)
-			= (Ok acc, Just (msgs++map decode nd,[],sendStopped), map encode send, False)
+			onConnect :: String ChD -> (MaybeErrorString String, Maybe ChD, [String], Bool)
+			onConnect acc (msgs,send,sendStopped)
+			| not (trace_tn "onConnect") = undef
+			| isEmpty send = (Ok "", Nothing, [], False)
+			= (Ok "", Just (msgs, [], sendStopped), map encode send, False)
 
-			process :: String -> (String, [String])
-			process s = case indexOf "\n" s of
-				-1 = (s, [])
-				i = appSnd (\ss->[s % (0,i):ss]) (process (s % (i+1, size s)))
+			onData :: String String ChD -> (MaybeErrorString String, Maybe ChD, [String], Bool)
+			onData newdata acc (msgs,send,True)
+			| not (trace_tn "onData: stop") = undef
+			= (Ok acc, Nothing, [], True)
+			onData newdata acc (msgs,send,sendStopped)
+			| not (trace_tn "onData: notstop") = undef
+			# split = indexOf "\n" newdata
+			| split == -1 = (Ok acc, Just (msgs, send, False), [], False)
+			# newMsg = decode (newdata % (0, split-1))
+			// Recurse with smaller data, empty accumulator and new message
+			= onData (newdata % (split+1, size newdata - split))
+				"" (msgs ++ [newMsg], send, False)
 			
-			onDisconnect :: String ([MTaskMSGRecv],[MTaskMSGSend],Bool) -> (MaybeErrorString String, Maybe ([MTaskMSGRecv],[MTaskMSGSend],Bool))
-			onDisconnect _ (msgs,send,sendStopped) = (Ok "", Nothing)
+			onShareChange :: String ChD -> (MaybeErrorString String, Maybe ChD, [String], Bool)
+			// Stop!
+			onShareChange acc (msgs,send,True)
+			| not (trace_tn "onSC: stop") = undef
+			= (Ok acc, Nothing, [], True)
+			// Nothing to send
+			onShareChange acc (msgs,[], _) = (Ok acc, Nothing, [], False)
+			// Something to send
+			onShareChange acc (msgs,send, ss)
+			| not (trace_tn "onSC: send") = undef
+			= (Ok acc, Just (msgs,[],ss), map encode send, False)
+
+			onDisconnect :: String ChD -> (MaybeErrorString String, Maybe ChD)
+			onDisconnect _ (msgs,send,_)
+			| not (trace_tn "ondisconnect") = undef
+			= (Ok "", Just ([], [], True))