refactor(config-shared): curryify create* functions

Author: shanoaice

Aurum.Configuration/ShareLinks.fs

@@ -13,7 +13,7 @@ let createV2FlyObjectFromUri (uriObject: System.Uri) =
   let protocolSetting =
     match uriObject.Scheme with
     | "vmess" ->
-      createVMessObject (uriObject.Host, uriObject.Port, uriObject.UserInfo, VMessSecurity.Auto)
+      createVMessObject uriObject.Host uriObject.Port uriObject.UserInfo VMessSecurity.Auto
       |> Success
     | unknown -> Failure([ ShareLinkFormatException $"unknown sharelink protocol {unknown}" ])
 
@@ -34,11 +34,11 @@ let createV2FlyObjectFromUri (uriObject: System.Uri) =
   let securitySetting =
     match securityType with
     | "tls" ->
-      createTLSObject (
-        tryRetrieveFromShareLink "sni",
-        tryRetrieveFromShareLink "alpn"
-        |> Option.map (fun alpn -> alpn.Split(",") |> Seq.toList)
-      )
+      createTLSObject
+        (tryRetrieveFromShareLink "sni")
+        (tryRetrieveFromShareLink "alpn"
+         |> Option.map (fun alpn -> alpn.Split(",") |> Seq.toList))
+
       |> Success
     | "none" -> Success(TransportSecurity.None)
     | unsupported -> Failure([ ShareLinkFormatException $"unsupported security type {unsupported}" ])
@@ -53,28 +53,26 @@ let createV2FlyObjectFromUri (uriObject: System.Uri) =
       (fun transportType ->
         match transportType with
         | "ws" ->
-          createWebSocketObject (
-            (tryRetrieveFromShareLink "path"),
-            None,
-            None,
-            None,
-            (tryRetrieveFromShareLink "host"),
-            None
-          )
+          createWebSocketObject (tryRetrieveFromShareLink "path") None None None (tryRetrieveFromShareLink "host") None
+
           |> Success
         | "grpc" ->
           retrieveFromShareLink "serviceName"
           |> Result.mapError (fun e -> [ e ])
           |> Validation.ofResult
           |> Validation.map createGrpcObject
         | "http" ->
-          createHttpObject (tryRetrieveFromShareLink "path", tryRetrieveFromShareLink "host", Dictionary())
+          createHttpObjectWithHost
+            (tryRetrieveFromShareLink "path")
+            (tryRetrieveFromShareLink "host")
+            (HTTP2)
+            (Some(Dictionary()))
           |> Success
         | "quic" -> createQuicObject () |> Success
         | "kcp" ->
-          createKCPObject (None, None, None, None, None, None, None, (tryRetrieveFromShareLink "seed"))
+          createKCPObject None None None None None None None (tryRetrieveFromShareLink "seed")
           |> Success
-        | "tcp" -> createTCPObject () |> Success
+        | "tcp" -> createHttpObjectWithHost None None HTTP1 None |> Success
         | unknown -> Failure([ ConfigurationParameterException $"unknown transport protocol {unknown}" ]))
       transportType
 

Aurum.Configuration/Shared/V2fly.fs

@@ -293,7 +293,7 @@ module V2flyObject =
   let inline _StreamSettings f (p: V2flyObject) =
     f p.StreamSettings <&> fun x -> { p with StreamSettings = x }
 
-let createWebSocketObject (path, maxEarlyData, browserForwarding, earlyDataHeader, host, headers) =
+let createWebSocketObject path maxEarlyData browserForwarding earlyDataHeader host headers =
   let constructedHeaders = Option.defaultValue (Dictionary()) headers
 
   match host with
@@ -314,19 +314,20 @@ let createGrpcObject serviceName =
 
   GRPC config
 
-let createHttpObject (path, host: string option, headers) =
+let createHttpObjectWithHost path (host: string option) version headers =
   let parsedHost =
     Option.map (fun (host: string) -> host.Split "," |> Seq.toList) host
     |> Option.defaultValue []
 
   let config =
     { HttpObject.Path = Option.defaultValue "/" path
       Headers = headers
+      Version = version
       Host = parsedHost }
 
   HTTP config
 
-let createKCPObject (mtu, tti, uplinkCapacity, downlinkCapacity, congestion, readBufferSize, writeBufferSize, seed) =
+let createKCPObject mtu tti uplinkCapacity downlinkCapacity congestion readBufferSize writeBufferSize seed =
 
   let config =
     { KcpObject.MTU = Option.defaultValue 1350 mtu
@@ -342,13 +343,13 @@ let createKCPObject (mtu, tti, uplinkCapacity, downlinkCapacity, congestion, rea
 
 let createQuicObject () = QUIC
 
-let createTLSObject (serverName, alpn) =
+let createTLSObject serverName alpn =
   TransportSecurity.TLS
     { TlsObject.ServerName = serverName
       ALPN = alpn
       AllowInsecure = Some false }
 
-let createVMessObject (host, port, uuid, security) =
+let createVMessObject host port uuid security =
   VMess
     { VMessObject.Address = host
       Port = port

Aurum.Configuration/V2fly/Outbound.fs

@@ -61,24 +61,24 @@ type OutboundObject =
         let options = opt.Split(";") |> Array.toList
 
         if options.Length = 0 then
-          let transportSettings = createWebSocketObject (None, None, None, None, None, None)
+          let transportSettings = createWebSocketObject None None None None None None
 
           { TransportSettings = transportSettings
             SecuritySettings = TransportSecurity.None }
         elif options |> List.contains "tls" then
           let host = (options |> List.find (fun a -> a.IndexOf("host") <> -1)).Split("=")[1]
 
           let transportSettings =
-            createWebSocketObject (None, None, None, Some host, None, None)
+            createWebSocketObject None None None (Some host) None None
 
-          let securitySettings = createTLSObject (Some host, None)
+          let securitySettings = createTLSObject (Some host) None
 
           { TransportSettings = transportSettings
             SecuritySettings = securitySettings }
         elif options |> List.exists (fun a -> a.IndexOf("mode") <> -1) then
           let host = (options |> List.find (fun a -> a.IndexOf("host") <> -1)).Split("=")[1]
           let transportSettings = createQuicObject ()
-          let securitySettings = createTLSObject (Some host, None)
+          let securitySettings = createTLSObject (Some host) None
 
           { TransportSettings = transportSettings
             SecuritySettings = securitySettings }
@@ -148,7 +148,8 @@ type OutboundJsonObject =
         Settings = settings
         Tag = this.Tag
         StreamSettings = this.StreamSettings
-        Mux = this.Mux } |> Ok
+        Mux = this.Mux }
+      |> Ok
     | Error e -> Error e
 
 let createV2flyOutboundObject sendThrough setting streamSetting tag mux =