@@ -1,7 +1,6 @@
11-- | This module provides 'RequesterT', the standard implementation of
22-- 'Requester'.
33{-# LANGUAGE AllowAmbiguousTypes #-}
4−{-# LANGUAGE ApplicativeDo #-}
54{-# LANGUAGE CPP #-}
65{-# LANGUAGE EmptyDataDecls #-}
76{-# LANGUAGE ExistentialQuantification #-}
@@ -33,7 +32,6 @@ module Reflex.Requester.Base
3332 , requesterDataToList
3433 , singletonRequesterData
3534 , matchResponsesWithRequests
36− , matchResponseMapWithRequests
3735 , multiEntry
3836 , unMultiEntry
3937 , requesting'
@@ -51,17 +49,14 @@ import Reflex.TriggerEvent.Class
5149import Control.Applicative (liftA2)
5250import Control.Monad.Exception
5351import Control.Monad.Identity
54−import Control.Monad.Morph
5552import Control.Monad.Primitive
5653import Control.Monad.Reader
5754import Control.Monad.Ref
5855import Control.Monad.State.Strict
5956import Data.Bits
6057import Data.Coerce
61−import Data.Constraint
62−import Data.Dependent.Map (DMap)
58+import Data.Dependent.Map (DMap, DSum (..))
6359import qualified Data.Dependent.Map as DMap
64−import Data.Dependent.Sum (DSum (..))
6560import Data.Functor.Compose
6661import Data.Functor.Misc
6762import Data.IntMap.Strict (IntMap)
@@ -84,51 +79,19 @@ newtype TagMap (f :: * -> *) = TagMap (IntMap Any)
8479
8580newtype RequesterData f = RequesterData (TagMap (Entry f))
8681
87−emptyRequesterData :: RequesterData f
88−emptyRequesterData = RequesterData $ TagMap IntMap.empty
89−
9082data RequesterDataKey a where
9183 RequesterDataKey_Single :: {-# UNPACK #-} !(MyTag (Single a)) -> RequesterDataKey a
9284 RequesterDataKey_Multi :: {-# UNPACK #-} !(MyTag Multi) -> {-# UNPACK #-} !Int -> !(RequesterDataKey a) -> RequesterDataKey a --TODO: Don't put a second Int here (or in the other Multis); use a single Int instead
93− RequesterDataKey_Multi2 :: GCompare k => {-# UNPACK #-} !(MyTag (Multi2 k)) -> !(Some k) -> {-# UNPACK #-} !Int -> !(RequesterDataKey a) -> RequesterDataKey a
85+ RequesterDataKey_Multi2 :: {-# UNPACK #-} !(MyTag (Multi2 k)) -> !(Some k) -> {-# UNPACK #-} !Int -> !(RequesterDataKey a) -> RequesterDataKey a
9486 RequesterDataKey_Multi3 :: {-# UNPACK #-} !(MyTag Multi3) -> {-# UNPACK #-} !Int -> {-# UNPACK #-} !Int -> !(RequesterDataKey a) -> RequesterDataKey a
9587
9688singletonRequesterData :: RequesterDataKey a -> f a -> RequesterData f
9789singletonRequesterData rdk v = case rdk of
9890 RequesterDataKey_Single k -> RequesterData $ singletonTagMap k $ Entry v
9991 RequesterDataKey_Multi k k' k'' -> RequesterData $ singletonTagMap k $ Entry $ IntMap.singleton k' $ singletonRequesterData k'' v
100− RequesterDataKey_Multi2 k k' k'' k''' -> RequesterData $ singletonTagMap k $ Entry $ Multi2Contents
101− { _multi2Contents_values = Map.singleton k' $ IntMap.singleton k'' $ singletonRequesterData k''' v
102− , _multi2Contents_dict = Dict
103− }
92+ RequesterDataKey_Multi2 k k' k'' k''' -> RequesterData $ singletonTagMap k $ Entry $ Map.singleton k' $ IntMap.singleton k'' $ singletonRequesterData k''' v
10493 RequesterDataKey_Multi3 k k' k'' k''' -> RequesterData $ singletonTagMap k $ Entry $ IntMap.singleton k' $ IntMap.singleton k'' $ singletonRequesterData k''' v
10594
106−mergeRequesterData :: RequesterData f -> RequesterData f -> RequesterData f
107−mergeRequesterData (RequesterData a) (RequesterData b) = RequesterData $ mergeTagMap a b
108−
109−mergeTagMap :: forall f. TagMap (Entry f) -> TagMap (Entry f) -> TagMap (Entry f)
110−mergeTagMap (TagMap m) (TagMap n) =
111− TagMap $ IntMap.unionWithKey (g' combiner) m n
112− where
113− combiner :: forall a. MyTag a -> Entry f a -> Entry f a -> Entry f a
114− combiner k (Entry a) (Entry b) = Entry $ case myKeyType k of
115− MyTagType_Single -> a
116− MyTagType_Multi -> IntMap.unionWith mergeRequesterData a b
117− MyTagType_Multi2 -> case _multi2Contents_dict a of
118− Dict -> Multi2Contents
119− { _multi2Contents_values = Map.unionWith (IntMap.unionWith mergeRequesterData) (_multi2Contents_values a) (_multi2Contents_values b)
120− , _multi2Contents_dict = Dict
121− }
122− MyTagType_Multi3 -> IntMap.unionWith (IntMap.unionWith mergeRequesterData) a b
123− g' :: (forall a. MyTag a -> Entry f a -> Entry f a -> Entry f a) -> Int -> Any -> Any -> Any
124− g' f rawKey a b =
125− let k = MyTag rawKey :: MyTag a
126− fromAny :: Any -> Entry f a
127− fromAny = unsafeCoerce
128− toAny :: Entry f a -> Any
129− toAny = unsafeCoerce
130− in toAny $ f k (fromAny a) (fromAny b)
131−
13295requesterDataToList :: RequesterData f -> [DSum RequesterDataKey f]
13396requesterDataToList (RequesterData m) = do
13497 k :=> Entry e <- tagMapToList m
@@ -138,12 +101,11 @@ requesterDataToList (RequesterData m) = do
138101 (k', e') <- IntMap.toList e
139102 k'' :=> e'' <- requesterDataToList e'
140103 return $ RequesterDataKey_Multi k k' k'' :=> e''
141− MyTagType_Multi2 -> case _multi2Contents_dict e of
142− Dict -> do
143− (k', e') <- Map.toList $ _multi2Contents_values e
144− (k'', e'') <- IntMap.toList e'
145− k''' :=> e''' <- requesterDataToList e''
146− return $ RequesterDataKey_Multi2 k k' k'' k''' :=> e'''
104+ MyTagType_Multi2 -> do
105+ (k', e') <- Map.toList e
106+ (k'', e'') <- IntMap.toList e'
107+ k''' :=> e''' <- requesterDataToList e''
108+ return $ RequesterDataKey_Multi2 k k' k'' k''' :=> e'''
147109 MyTagType_Multi3 -> do
148110 (k', e') <- IntMap.toList e
149111 (k'', e'') <- IntMap.toList e'
@@ -171,13 +133,7 @@ traverseRequesterData f (RequesterData m) = RequesterData <$> traverseTagMapWith
171133 go k (Entry request) = Entry <$> case myKeyType k of
172134 MyTagType_Single -> f request
173135 MyTagType_Multi -> traverse (traverseRequesterData f) request
174− MyTagType_Multi2 -> case request of
175− Multi2Contents { _multi2Contents_values = request', _multi2Contents_dict = Dict } -> do
176− v <- traverse (traverse (traverseRequesterData f)) request'
177− pure $ Multi2Contents
178− { _multi2Contents_values = v
179− , _multi2Contents_dict = Dict
180− }
136+ MyTagType_Multi2 -> traverse (traverse (traverseRequesterData f)) request
181137 MyTagType_Multi3 -> traverse (traverse (traverseRequesterData f)) request
182138
183139-- | 'traverseRequesterData' with its arguments flipped
@@ -221,14 +177,9 @@ instance MyTagTypeOffset Multi3 where
221177type family EntryContents request a where
222178 EntryContents request (Single a) = request a
223179 EntryContents request Multi = IntMap (RequesterData request)
224− EntryContents request (Multi2 k) = Multi2Contents k request
180+ EntryContents request (Multi2 k) = Map (Some k) (IntMap (RequesterData request))
225181 EntryContents request Multi3 = IntMap (IntMap (RequesterData request))
226182
227−data Multi2Contents k request = Multi2Contents
228− { _multi2Contents_dict :: {-# UNPACK #-} !(Dict (GCompare k)) -- This is a Dict instead of an existential context because we only want to use it in certain circumstances
229− , _multi2Contents_values :: {-# UNPACK #-} !(Map (Some k) (IntMap (RequesterData request)))
230− }
231−
232183newtype Entry request x = Entry { unEntry :: EntryContents request x }
233184
234185{-# INLINE singleEntry #-}
@@ -357,7 +308,7 @@ tagRequest req = do
357308 return t
358309
359310{-# INLINE responseFromTag #-}
360−responseFromTag :: forall m t request response x. Monad m => MyTagWrap response (Entry response x) -> RequesterT t request response m (Event t (Entry response x))
311+responseFromTag :: Monad m => MyTagWrap response (Entry response x) -> RequesterT t request response m (Event t (Entry response x))
361312responseFromTag (MyTagWrap t) = do
362313 responses :: EventSelectorInt t Any <- RequesterT ask
363314 return $ (unsafeCoerce :: Event t Any -> Event t (Entry response x)) $ selectInt responses t
@@ -365,9 +316,6 @@ responseFromTag (MyTagWrap t) = do
365316instance MonadTrans (RequesterT t request response) where
366317 lift = RequesterT . lift . lift
367318
368−instance MFunctor (RequesterT t request response) where
369− hoist f = RequesterT . hoist (hoist f) . unRequesterT
370−
371319instance PerformEvent t m => PerformEvent t (RequesterT t request response m) where
372320 type Performable (RequesterT t request response m) = Performable m
373321 performEvent_ = lift . performEvent_
@@ -487,9 +435,9 @@ traverseDMapWithKeyWithAdjustRequesterTWith base mapPatch weakenPatchWith patchN
487435 let responses :: EventSelector t (Const2 (Some k) (IntMap (RequesterData response)))
488436 responses = fanMap $ fmapCheap unpack response
489437 unpack :: Entry response (Multi2 k) -> Map (Some k) (IntMap (RequesterData response))
490− unpack = _multi2Contents_values . unEntry
438+ unpack = unEntry
491439 pack :: Map (Some k) (IntMap (RequesterData request)) -> Entry request (Multi2 k)
492− pack m = Entry $ Multi2Contents { _multi2Contents_values = m, _multi2Contents_dict = Dict }
440+ pack = Entry
493441 f' :: forall a. k a -> Compose ((,) Int) v a -> m (Compose ((,) (Event t (IntMap (RequesterData request)))) v' a)
494442 f' k (Compose (n, v)) = do
495443 (result, myRequests) <- runRequesterT (f k v) $ mapMaybeCheap (IntMap.lookup n) $ select responses (Const2 (Some k))
@@ -510,30 +458,10 @@ traverseDMapWithKeyWithAdjustRequesterTWith base mapPatch weakenPatchWith patchN
510458data Decoder rawResponse response =
511459 forall a. Decoder (RequesterDataKey a) (rawResponse -> response a)
512460
513−matchResponsesWithRequests
514− :: forall t rawRequest rawResponse request response m.
515− ( MonadFix m
516− , MonadHold t m
517− , Reflex t
518− )
519− => (forall a. request a -> (rawRequest, rawResponse -> response a))
520− -- ^ Given a request (from 'Requester'), produces the wire format of the
521− -- request and a function used to process the associated response
522− -> Event t (RequesterData request)
523− -- ^ The outgoing requests
524− -> Event t (Int, rawResponse)
525− -- ^ The incoming responses, tagged by an identifying key
526− -> m ( Event t (Map Int rawRequest)
527− , Event t (RequesterData response)
528− )
529− -- ^ A map of outgoing wire-format requests and an event of responses keyed
530− -- by the 'RequesterData' key of the associated outgoing request
531−matchResponsesWithRequests f send recv = matchResponseMapWithRequests f send $ uncurry Map.singleton <$> recv
532−
533461-- | Matches incoming responses with previously-sent requests
534462-- and uses the provided request "decoder" function to process
535463-- incoming responses.
536−matchResponseMapWithRequests
464+matchResponsesWithRequests
537465 :: forall t rawRequest rawResponse request response m.
538466 ( MonadFix m
539467 , MonadHold t m
@@ -544,14 +472,14 @@ matchResponseMapWithRequests
544472 -- request and a function used to process the associated response
545473 -> Event t (RequesterData request)
546474 -- ^ The outgoing requests
547− -> Event t (Map Int rawResponse)
548− -- ^ A map of incoming responses, tagged by an identifying key
475+ -> Event t (Int, rawResponse)
476+ -- ^ The incoming responses, tagged by an identifying key
549477 -> m ( Event t (Map Int rawRequest)
550478 , Event t (RequesterData response)
551479 )
552480 -- ^ A map of outgoing wire-format requests and an event of responses keyed
553481 -- by the 'RequesterData' key of the associated outgoing request
554−matchResponseMapWithRequests f send recv = do
482+matchResponsesWithRequests f send recv = do
555483 rec nextId <- hold 1 $ fmap (\(next, _, _) -> next) outgoing
556484 waitingFor :: Incremental t (PatchMap Int (Decoder rawResponse response)) <-
557485 holdIncremental mempty $ leftmost
@@ -593,15 +521,17 @@ matchResponseMapWithRequests f send recv = do
593521 processIncoming
594522 :: Incremental t (PatchMap Int (Decoder rawResponse response))
595523 -- A map of outstanding expected responses
596− -> Event t (Map Int rawResponse)
524+ -> Event t (Int, rawResponse)
597525 -- A incoming response paired with its identifying key
598526 -> Event t (RequesterData response, PatchMap Int v)
599527 -- The decoded response and a patch that clears the outstanding responses queue
600− processIncoming waitingFor inc = flip push inc $ \rspMap -> do
528+ processIncoming waitingFor inc = flip push inc $ \(n, rawRsp) -> do
601529 wf <- sample $ currentIncremental waitingFor
602− let match rawRsp (Decoder k rspF) =
603− let rsp = rspF rawRsp
604− in singletonRequesterData k rsp
605− matches = Map.intersectionWith match rspMap wf
606− pure $ if Map.null matches then Nothing else Just
607− (Map.foldl' mergeRequesterData emptyRequesterData matches, PatchMap $ Nothing <$ matches)
530+ case Map.lookup n wf of
531+ Nothing -> return Nothing -- TODO How should lookup failures be handled here? They shouldn't ever happen..
532+ Just (Decoder k rspF) -> do
533+ let rsp = rspF rawRsp
534+ return $ Just
535+ ( singletonRequesterData k rsp
536+ , PatchMap $ Map.singleton n Nothing
537+ )