Network,Services,Utility: use Fsdk

Added fsdk package. Reuse functions from Fsdk.

Author: webwarrior-ws

NOnion/NOnion.fsproj

@@ -86,6 +86,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Fsdk" Version="0.6.0--date20230116-0113.git-2ef0522" />
     <PackageReference Include="Fsharpx.Collections" Version="3.0.1" />
     <PackageReference Include="Portable.BouncyCastle" Version="1.8.10" />
     <PackageReference Include="System.Memory" Version="4.5.4" />

NOnion/Network/TorGuard.fs

@@ -9,6 +9,8 @@ open System.Security.Authentication
 open System.Security.Cryptography
 open System.Threading
 
+open Fsdk
+
 open NOnion
 open NOnion.Cells
 open NOnion.Utility

NOnion/Services/TorServiceHost.fs

@@ -15,6 +15,7 @@ open Org.BouncyCastle.Crypto.Parameters
 open Org.BouncyCastle.Crypto.Generators
 open Org.BouncyCastle.Crypto.Signers
 open Org.BouncyCastle.Security
+open Fsdk
 
 open NOnion
 open NOnion.Cells.Relay

NOnion/Utility/FSharpUtil.fs

@@ -4,93 +4,41 @@ open System
 open System.Runtime.ExceptionServices
 
 open FSharpx.Collections
+open Fsdk
 
 open NOnion
 
 module FSharpUtil =
-    //Implementation copied from https://github.com/nblockchain/geewallet/blob/master/src/GWallet.Backend/FSharpUtil.fs
-    let ReRaise(ex: Exception) : Exception =
-        (ExceptionDispatchInfo.Capture ex).Throw()
-        failwith "Should be unreachable"
-        ex
-
-    let rec public FindException<'T when 'T :> Exception>
-        (ex: Exception)
-        : Option<'T> =
-        let rec findExInSeq(sq: seq<Exception>) =
-            match Seq.tryHeadTail sq with
-            | Some(head, tail) ->
-                match FindException head with
-                | Some ex -> Some ex
-                | None -> findExInSeq <| tail
-            | None -> None
-
-        if isNull ex then
-            None
-        else
-            match ex with
-            | :? 'T as specificEx -> Some specificEx
-            | :? AggregateException as aggEx ->
-                findExInSeq aggEx.InnerExceptions
-            | _ -> FindException<'T> ex.InnerException
-
-    type private Either<'Val, 'Err when 'Err :> Exception> =
-        | FailureResult of 'Err
-        | SuccessfulValue of 'Val
-
     let WithTimeout (timeSpan: TimeSpan) (job: Async<'R>) : Async<'R> =
         async {
-            let read =
-                async {
-                    let! value = job
-                    return value |> SuccessfulValue |> Some
-                }
-
-            let delay =
-                async {
-                    let total = int timeSpan.TotalMilliseconds
-                    do! Async.Sleep total
-                    return FailureResult <| TimeoutException() |> Some
-                }
-
-            let! dummyOption = Async.Choice([ read; delay ])
+            let! result = FSharpUtil.WithTimeout timeSpan job
 
-            match dummyOption with
-            | Some theResult ->
-                match theResult with
-                | SuccessfulValue r -> return r
-                | FailureResult _ -> return raise <| TimeoutErrorException()
-            | None ->
-                // none of the jobs passed to Async.Choice returns None
-                return failwith "unreachable"
+            match result with
+            | Some value -> return value
+            | None -> return raise <| TimeoutErrorException()
         }
 
     let Retry<'TEx when 'TEx :> Exception>
         (jobToRetry: Async<unit>)
         (maxRetryCount: int)
         =
-        let rec retryLoop(tryNumber: int) =
-            async {
-                try
-                    do! jobToRetry
-                with
-                | :? 'TEx as ex ->
-                    if tryNumber < maxRetryCount then
-                        return! retryLoop(tryNumber + 1)
-                    else
-                        sprintf
-                            "Maximum retry count reached, ex = %s"
-                            (ex.ToString())
-                        |> TorLogger.Log
-
-                        return raise <| ReRaise ex
-                | ex ->
-                    sprintf
-                        "Unexpected exception happened in the retry loop, ex = %s"
-                        (ex.ToString())
-                    |> TorLogger.Log
-
-                    return raise <| ReRaise ex
-            }
-
-        retryLoop 0
+        async {
+            try
+                do!
+                    FSharpUtil.Retry<_, 'TEx>
+                        (fun () -> jobToRetry)
+                        maxRetryCount
+            with
+            | :? 'TEx as ex ->
+                sprintf "Maximum retry count reached, ex = %s" (ex.ToString())
+                |> TorLogger.Log
+
+                return raise <| FSharpUtil.ReRaise ex
+            | ex ->
+                sprintf
+                    "Unexpected exception happened in the retry loop, ex = %s"
+                    (ex.ToString())
+                |> TorLogger.Log
+
+                return raise <| FSharpUtil.ReRaise ex
+        }

NOnion/Utility/MailboxUtil.fs

@@ -2,6 +2,8 @@
 
 open System.Net.Sockets
 
+open Fsdk
+
 open NOnion
 
 module internal MailboxResultUtil =

NOnion/Utility/ResultUtil.fs

@@ -1,5 +1,7 @@
 namespace NOnion.Utility
 
+open Fsdk
+
 //FIXME: for some reason FSharpUtil is in NOnion namespace instead of NOnion.Utility
 open NOnion