A peer-to-peer stack for code collaboration
Attempt to fix #636
Kim Altintop95142cfa3cb2
diff --git a/package.yaml b/package.yamlindex ae29b8b..428a524 100644--- a/package.yaml+++ b/package.yaml@@ -38,6 +38,7 @@ library:- aeson- ansi-terminal- bytestring+ - clock- conduit- conduit-extra- containersdiff --git a/src/Radicle/Ipfs.hs b/src/Radicle/Ipfs.hsindex 83b6edf..5ed21d2 100644--- a/src/Radicle/Ipfs.hs+++ b/src/Radicle/Ipfs.hs@@ -39,14 +39,17 @@ module Radicle.Ipfs, ipfsHttpPost') where-import Protolude hiding (TypeError, catch, catches, try)+import Protolude hiding (TypeError, catch)import Control.Exception.Safe+ (MonadCatch, MonadMask, catch, throw, throwString)+import qualified Control.Exception.Safe as Safeimport Control.Monad.Failimport Control.Monad.Trans.Resourceimport Control.Retry- ( RetryPolicyM+ ( RetryPolicyM(..), capDelay+ , defaultRetryStatus, fullJitterBackoff, logRetries, recovering@@ -62,6 +65,7 @@ import qualified Data.Conduit as Cimport qualified Data.Conduit.Attoparsec as Cimport qualified Data.Conduit.Combinators as Cimport qualified Data.HashMap.Strict as HashMap+import Data.IORef (IORef, newIORef, readIORef, writeIORef)import Data.IPLD.CIDimport qualified Data.Text as Timport qualified Data.Text.Encoding as T@@ -71,6 +75,7 @@ import qualified Network.HTTP.Client as HttpClientimport qualified Network.HTTP.Client.MultipartFormData as HttpClientimport qualified Network.HTTP.Conduit as HttpConduitimport qualified Network.HTTP.Types.Method as Http+import qualified System.Clock as Clockimport System.Environment (lookupEnv)import Radicle.Daemon.Logging@@ -248,11 +253,14 @@ subscribe topic messageHandler = dopure ()wherewithBackoff :: (MonadLog m, MonadMask m) => m a -> m a- withBackoff action- = recovering- policy+ withBackoff action = do+ lastFailure <- liftIO $ Clock.getTime Clock.Monotonic >>= newIORef+ recovering+ (resetAfter lastFailure (60 * minutes) policy)(skipAsyncExceptions ++ [h]) -- `h` should be *after* skipAsync!- (const action)+ . const $+ action `Safe.onException`+ liftIO (Clock.getTime Clock.Monotonic >>= writeIORef lastFailure)whereh = logRetries (\(_ :: SomeException) -> pure True)(\_ exc rs ->@@ -264,6 +272,21 @@ subscribe topic messageHandler = dopolicy :: (MonadIO m) => RetryPolicyM mpolicy = capDelay (1 * minutes) $ fullJitterBackoff (seconds `div` 10)+ resetAfter+ :: (MonadIO m)+ => IORef Clock.TimeSpec+ -> Int+ -> RetryPolicyM m+ -> RetryPolicyM m+ resetAfter ref (fromIntegral . div seconds -> secs) p = RetryPolicyM $ \n -> do+ delta <- liftIO $+ Clock.diffTimeSpec+ <$> readIORef ref+ <*> Clock.getTime Clock.Monotonic+ let n' | Clock.sec delta > secs = defaultRetryStatus+ | otherwise = n+ getRetryPolicyM p n'+fromJSONC :: (MonadThrow m, Aeson.FromJSON a) => C.ConduitT ByteString a m ()fromJSONC = jsonC .| C.mapM parseThrow