improve clientKeepLocked

Command/P2PHttp.hs

@@ -133,18 +133,15 @@ getAuthEnv = do
 testKeepLocked = do
 	mgr <- httpManager <$> getUrlOptions
 	burl <- liftIO $ parseBaseUrl "http://localhost:8080/"
-	keeplocked <- liftIO newEmptyTMVarIO
-	_ <- liftIO $ forkIO $ do
-		print "running, press enter to drop lock"
-		_ <- getLine
-		atomically $ writeTMVar keeplocked False
 	liftIO $ clientKeepLocked (mkClientEnv mgr burl)
 		(P2P.ProtocolVersion 3)
 		(B64UUID (toUUID ("lck" :: String)))
 		(B64UUID (toUUID ("cu" :: String)))
 		(B64UUID (toUUID ("su" :: String)))
-		[]
+		[] $ \keeplocked -> do
-		keeplocked
+			print "running, press enter to drop lock"
+			_ <- getLine
+			atomically $ writeTMVar keeplocked False
 
 testCheckPresent = do
 	mgr <- httpManager <$> getUrlOptions

P2P/Http.hs

@@ -873,28 +873,31 @@ clientKeepLocked
 	-> B64UUID ClientSide
 	-> B64UUID ServerSide
 	-> [B64UUID Bypass]
-	-> TMVar Bool
+	-> (TMVar Bool -> IO ())
+	-- ^ The TMVar can be filled any number of times with True to send
+	-- repeated keep locked requests, eg to keep a connection alive.
+	-- Once filled with False, the lock will be dropped.
 	-> IO ()
-clientKeepLocked clientenv (ProtocolVersion ver) lckid cu su bypass keeplocked = do
+clientKeepLocked clientenv (ProtocolVersion ver) lckid cu su bypass a = do
+	keeplocked <- newEmptyTMVarIO
+	tid <- async $ a keeplocked
+	let cli' = cli lckid cu bypass
+		(Just connectionKeepAlive) (Just keepAlive)
+		(S.fromStepT (unlocksender keeplocked))
 	withClientM cli' clientenv $ \case
-		Left err  -> throwM err
 		Right (LockResult _ _) ->
-			liftIO $ print "end of lock connection to server"
+			wait tid
+		Left err  -> do
+			wait tid
+			throwM err
   where
-	unlocksender =
+	unlocksender keeplocked =
 		S.Yield (UnlockRequest False) $ S.Effect $ do
-			liftIO $ print "sent keep locked request"
 			return $ S.Effect $ do
 				stilllocked <- liftIO $ atomically $ takeTMVar keeplocked
-				if stilllocked
+				return $ if stilllocked
-					then return unlocksender
+					then unlocksender keeplocked
-					else do
+					else S.Yield (UnlockRequest True) S.Stop
-						liftIO $ print "sending unlock request"
-						return $ S.Yield (UnlockRequest True) S.Stop
-
-	cli' = cli lckid cu bypass
-		(Just connectionKeepAlive) (Just keepAlive)
-		(S.fromStepT unlocksender)
 	
 	cli = case ver of
 		3 -> v3 su V3