diff --git a/src/Simplex/Messaging/Server.hs b/src/Simplex/Messaging/Server.hs index 20ad06119..88e15bf78 100644 --- a/src/Simplex/Messaging/Server.hs +++ b/src/Simplex/Messaging/Server.hs @@ -73,7 +73,7 @@ import Data.List.NonEmpty (NonEmpty (..), (<|)) import qualified Data.List.NonEmpty as L import Data.Map.Strict (Map) import qualified Data.Map.Strict as M -import Data.Maybe (fromMaybe, isJust, isNothing) +import Data.Maybe (catMaybes, fromMaybe, isJust, isNothing) import Data.Semigroup (Sum (..)) import qualified Data.Set as S import Data.Text (Text) @@ -1440,25 +1440,36 @@ client prepareBatchSubs :: Maybe ServiceId -> NonEmpty (VerifiedTransmission s) -> - M s (Either ErrorType (Map RecipientId Message, Map RecipientId (Either ErrorType ()), Map RecipientId (Either ErrorType ()))) + M s (Either ErrorType (Map RecipientId Message, Map RecipientId (Either ErrorType ()), Map RecipientId (Either ErrorType ()), Map RecipientId Sub)) prepareBatchSubs clntServiceId_ batch = do - let (subMsgQs, rcvAssocQs, ntfAssocQs) = foldr partitionSubs ([], [], []) batch - partitionSubs t (msgQs, rcvQs, ntfQs) = case t of + let (subMsgQs, rcvAssocQs, ntfAssocQs, newSubQs) = foldr partitionSubs ([], [], [], []) batch + partitionSubs t (msgQs, rcvQs, ntfQs, newQs) = case t of (Just (q, qr), (_, _, Cmd SRecipient SUB)) - | clntServiceId_ /= rcvServiceId qr -> (q : msgQs, q : rcvQs, ntfQs) - | otherwise -> (q : msgQs, rcvQs, ntfQs) + | clntServiceId_ /= rcvServiceId qr -> (q : msgQs, q : rcvQs, ntfQs, newQs) + | isNothing clntServiceId_ && status qr == EntityActive -> (q : msgQs, rcvQs, ntfQs, q : newQs) + | otherwise -> (q : msgQs, rcvQs, ntfQs, newQs) (Just (q, qr), (_, _, Cmd SNotifier NSUB)) - | clntServiceId_ /= (notifier qr >>= ntfServiceId) -> (msgQs, rcvQs, q : ntfQs) - _ -> (msgQs, rcvQs, ntfQs) + | clntServiceId_ /= (notifier qr >>= ntfServiceId) -> (msgQs, rcvQs, q : ntfQs, newQs) + _ -> (msgQs, rcvQs, ntfQs, newQs) liftIO $ runExceptT $ do rcvAssocs <- ifNotNull rcvAssocQs $ setService SRecipientService clntServiceId_ ntfAssocs <- ifNotNull ntfAssocQs $ setService SNotifierService clntServiceId_ + newSubs <- liftIO $ M.fromList . catMaybes <$> mapM subscribeQueue newSubQs msgs <- ifNotNull subMsgQs $ tryPeekMsgs ms - pure (msgs, rcvAssocs, ntfAssocs) + pure (msgs, rcvAssocs, ntfAssocs, newSubs) where ifNotNull qs f = if null qs then pure M.empty else f qs setService :: (PartyI p, ServiceParty p) => SParty p -> Maybe ServiceId -> [StoreQueue s] -> ExceptT ErrorType IO (Map RecipientId (Either ErrorType ())) setService party sId = ExceptT . setQueueServices (queueStore ms) party sId + subscribeQueue :: StoreQueue s -> IO (Maybe (RecipientId, Sub)) + subscribeQueue q = + TM.lookupOrInsertIO rId (newSubscription NoSub) (subscriptions clnt) >>= \case + Left sub -> do + mask_ $ processClientSub subscribers subscriptions serviceSubsCount (Just cancelSub) (Just clnt) (CSClient rId Nothing Nothing, clientId) + pure $ Just (rId, sub) + Right _ -> pure Nothing + where + rId = recipientId q processProxiedCmd :: Transmission (Command 'ProxiedClient) -> M s (Maybe ResponseAndMessage) processProxiedCmd (corrId, EntityId sessId, command) = (\t -> ((corrId, EntityId sessId, t), Nothing)) <$$> case command of @@ -1586,7 +1597,7 @@ client mkIncProxyStats ps psOwn own sel = do incStat $ sel ps when own $ incStat $ sel psOwn - processCommand :: Maybe ServiceId -> Either ErrorType (Map RecipientId Message, Map RecipientId (Either ErrorType ()), Map RecipientId (Either ErrorType ())) -> VerifiedTransmission s -> M s (Maybe ResponseAndMessage) + processCommand :: Maybe ServiceId -> Either ErrorType (Map RecipientId Message, Map RecipientId (Either ErrorType ()), Map RecipientId (Either ErrorType ()), Map RecipientId Sub) -> VerifiedTransmission s -> M s (Maybe ResponseAndMessage) processCommand clntServiceId batchSubs (q_, (corrId, entId, cmd)) = case cmd of Cmd SProxiedClient command -> processProxiedCmd (corrId, entId, command) Cmd SSender command -> case command of @@ -1603,7 +1614,7 @@ client Cmd SNotifier NSUB -> response . (corrId,entId,) <$> case q_ of Just (q, QueueRec {notifier = Just ntfCreds}) -> either (pure . ERR) (\_ -> subscribeNotifications q ntfCreds) - $ batchSubs >>= \(_, _, ntfAssocs) -> sequence (M.lookup (recipientId q) ntfAssocs) + $ batchSubs >>= \(_, _, ntfAssocs, _) -> sequence (M.lookup (recipientId q) ntfAssocs) _ -> pure $ ERR INTERNAL Cmd SNotifierService (NSUBS n idsHash) -> response . (corrId,entId,) <$> case clntServiceId of Just serviceId -> subscribeServiceNotifications serviceId (n, idsHash) @@ -1616,9 +1627,9 @@ client pure $ allowNewQueues && maybe True ((== auth_) . Just) newQueueBasicAuth Cmd SRecipient command -> case command of - SUB -> case batchSubs >>= \(msgs, rcvAssocs, _) -> sequence (M.lookup entId rcvAssocs) $> msgs of + SUB -> case batchSubs >>= \(msgs, rcvAssocs, _, newSubs) -> sequence (M.lookup entId rcvAssocs) $> (msgs, newSubs) of Left e -> pure $ Just (err e, Nothing) - Right msgs -> withQueue' $ subscribeQueueAndDeliver $ M.lookup entId msgs + Right (msgs, newSubs) -> withQueue' $ subscribeQueueAndDeliver (M.lookup entId msgs) (M.lookup entId newSubs) GET -> withQueue getMessage ACK msgId -> withQueue $ acknowledgeMsg msgId KEY sKey -> withQueue $ \q _ -> either err (corrId,entId,) <$> secureQueue_ q sKey @@ -1759,9 +1770,10 @@ client suspendQueue_ :: (StoreQueue s, QueueRec) -> M s (Transmission BrokerMsg) suspendQueue_ (q, _) = liftIO $ either err (const ok) <$> suspendQueue (queueStore ms) q - subscribeQueueAndDeliver :: Maybe Message -> StoreQueue s -> QueueRec -> M s ResponseAndMessage - subscribeQueueAndDeliver msg_ q qr@QueueRec {rcvServiceId} = - liftIO (TM.lookupIO entId $ subscriptions clnt) >>= \case + subscribeQueueAndDeliver :: Maybe Message -> Maybe Sub -> StoreQueue s -> QueueRec -> M s ResponseAndMessage + subscribeQueueAndDeliver msg_ newSub_ q qr@QueueRec {rcvServiceId} = case newSub_ of + Just s -> deliver (False, Just s) + Nothing -> liftIO (TM.lookupIO entId $ subscriptions clnt) >>= \case Nothing -> deliver =<< sharedSubscribeQueue q rcvServiceId subscribers subscriptions serviceSubsCount (newSubscription NoSub) rcvServices Just s@Sub {subThread} -> do @@ -2217,7 +2229,7 @@ client resolveNameMsg (thVersion clntTHParams) nenv d >>= sendResolved -- INTERNAL because processCommand never returns Nothing for sender commands; -- `fst` drops the empty message only returned for SUB. - _ -> Just . maybe (corrId', entId', ERR INTERNAL) fst <$> lift (processCommand Nothing (Right (M.empty, M.empty, M.empty)) t'') + _ -> Just . maybe (corrId', entId', ERR INTERNAL) fst <$> lift (processCommand Nothing (Right (M.empty, M.empty, M.empty, M.empty)) t'') stats <- asks serverStats incStat $ pMsgFwdsRecv stats traverse encodeResp r_ >>= \case