Breaking Change: changed default cookiejar in shared library to be fhttp cookiejar and not tls_client cookiejar anymore;

bogdanfinn · bogdanfinn · commit 71e7aa4e1775 · 2025-12-25T21:30:33.000+01:00
diff --git a/cffi_dist/example_csharp/Requester.cs b/cffi_dist/example_csharp/Requester.cs
@@ -24,7 +24,7 @@ class RequestPayload
     public bool FollowRedirects { get; set; } = true;
     public bool InsecureSkipVerify { get; set; } = false;
     public bool WithoutCookieJar { get; set; } = false;
-    public bool WithDefaultCookieJar { get; set; } = false;
+    public bool WithCustomCookieJar { get; set; } = false;
     public bool IsByteRequest { get; set; } = false;
     public bool ForceHttp1 { get; set; } = false;
     public bool WithDebug { get; set; } = false;
diff --git a/cffi_dist/example_node/index.js b/cffi_dist/example_node/index.js
@@ -15,7 +15,7 @@ const requestPayload = {
     "followRedirects": true,
     "insecureSkipVerify": false,
     "withoutCookieJar": false,
-    "withDefaultCookieJar": false,
+    "withCustomCookieJar": false,
     "isByteRequest": false,
     "catchPanics": false,
     "withDebug": false,
diff --git a/cffi_dist/example_node/index_async.js b/cffi_dist/example_node/index_async.js
@@ -15,7 +15,7 @@ const requestPayload = {
     "followRedirects": false,
     "insecureSkipVerify": false,
     "withoutCookieJar": false,
-    "withDefaultCookieJar": false,
+    "withCustomCookieJar": false,
     "isByteRequest": false,
     "forceHttp1": false,
     "withRandomTLSExtensionOrder": false,
diff --git a/cffi_dist/example_node/index_cookies.js b/cffi_dist/example_node/index_cookies.js
@@ -15,7 +15,7 @@ const requestPayload = {
     "followRedirects": true,
     "insecureSkipVerify": false,
     "withoutCookieJar": false,
-    "withDefaultCookieJar": false,
+    "withCustomCookieJar": false,
     "isByteRequest": false,
     "catchPanics": false,
     "withDebug": false,
diff --git a/cffi_dist/example_node/index_custom_client.js b/cffi_dist/example_node/index_custom_client.js
@@ -14,7 +14,7 @@ const requestPayload = {
     "followRedirects": false,
     "insecureSkipVerify": false,
     "withoutCookieJar": false,
-    "withDefaultCookieJar": false,
+    "withCustomCookieJar": false,
     "isByteRequest": false,
     "catchPanics": false,
     "forceHttp1": false,
diff --git a/cffi_dist/example_node/index_ffi_rs.js b/cffi_dist/example_node/index_ffi_rs.js
@@ -62,7 +62,7 @@ const requestPayload = {
     "followRedirects": true,
     "insecureSkipVerify": false,
     "withoutCookieJar": false,
-    "withDefaultCookieJar": false,
+    "withCustomCookieJar": false,
     "isByteRequest": false,
     "catchPanics": false,
     "withDebug": false,
diff --git a/cffi_dist/example_node/index_image.js b/cffi_dist/example_node/index_image.js
@@ -16,7 +16,7 @@ const requestPayload = {
     "followRedirects": false,
     "insecureSkipVerify": false,
     "withoutCookieJar": false,
-    "withDefaultCookieJar": false,
+    "withCustomCookieJar": false,
     "forceHttp1": false,
     "withDebug": false,
     "withRandomTLSExtensionOrder": false,
diff --git a/cffi_dist/example_node/index_image_upload.js b/cffi_dist/example_node/index_image_upload.js
@@ -18,7 +18,7 @@ const requestPayload = {
     "followRedirects": false,
     "insecureSkipVerify": false,
     "withoutCookieJar": false,
-    "withDefaultCookieJar": false,
+    "withCustomCookieJar": false,
     "forceHttp1": false,
     "withDebug": false,
     "withRandomTLSExtensionOrder": false,
diff --git a/cffi_dist/example_node/index_post.js b/cffi_dist/example_node/index_post.js
@@ -15,7 +15,7 @@ const requestPayload = {
     "followRedirects": false,
     "insecureSkipVerify": false,
     "withoutCookieJar": false,
-    "withDefaultCookieJar": false,
+    "withCustomCookieJar": false,
     "forceHttp1": false,
     "withDebug": false,
     "withRandomTLSExtensionOrder": false,
diff --git a/cffi_dist/example_python/example.py b/cffi_dist/example_python/example.py
@@ -32,7 +32,7 @@
     "followRedirects": False,
     "insecureSkipVerify": False,
     "withoutCookieJar": False,
-    "withDefaultCookieJar": False,
+    "withCustomCookieJar": False,
     "isByteRequest": False,
     "forceHttp1": False,
     "withDebug": False,
diff --git a/cffi_dist/example_python/example_cookies.py b/cffi_dist/example_python/example_cookies.py
@@ -32,7 +32,7 @@
     "followRedirects": False,
     "insecureSkipVerify": False,
     "withoutCookieJar": False,
-    "withDefaultCookieJar": False,
+    "withCustomCookieJar": False,
     "isByteRequest": False,
     "forceHttp1": False,
     "withDebug": False,
diff --git a/cffi_dist/example_python/example_custom_client.py b/cffi_dist/example_python/example_custom_client.py
@@ -31,7 +31,7 @@
     "followRedirects": False,
     "insecureSkipVerify": False,
     "withoutCookieJar": False,
-    "withDefaultCookieJar": False,
+    "withCustomCookieJar": False,
     "isByteRequest": False,
     "forceHttp1": False,
     "catchPanics": False,
diff --git a/cffi_dist/example_python/example_image.py b/cffi_dist/example_python/example_image.py
@@ -34,7 +34,7 @@
     "followRedirects": False,
     "insecureSkipVerify": False,
     "withoutCookieJar": False,
-    "withDefaultCookieJar": False,
+    "withCustomCookieJar": False,
     "isByteRequest": False,
     "forceHttp1": False,
     "withDebug": False,
diff --git a/cffi_dist/example_python/example_image_upload.py b/cffi_dist/example_python/example_image_upload.py
@@ -37,7 +37,7 @@
     "followRedirects": False,
     "insecureSkipVerify": False,
     "withoutCookieJar": False,
-    "withDefaultCookieJar": False,
+    "withCustomCookieJar": False,
     "isByteRequest": True,
     "forceHttp1": False,
     "withDebug": False,
diff --git a/cffi_dist/example_python/example_post.py b/cffi_dist/example_python/example_post.py
@@ -34,7 +34,7 @@
     "followRedirects": False,
     "insecureSkipVerify": False,
     "withoutCookieJar": False,
-    "withDefaultCookieJar": False,
+    "withCustomCookieJar": False,
     "forceHttp1": False,
     "withDebug": False,
     "withRandomTLSExtensionOrder": False,
diff --git a/cffi_src/factory.go b/cffi_src/factory.go
@@ -147,7 +147,7 @@ func BuildRequest(input RequestInput) (*http.Request, *TLSClientError) {
 func readAllBodyWithStreamToFile(respBody io.ReadCloser, input RequestInput) ([]byte, error) {
 	var respBodyBytes []byte
 	var err error
-	var bodyLen = 0
+	bodyLen := 0
 	f, err := os.OpenFile(*input.StreamOutputPath, os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0o600)
 	if err != nil {
 		return nil, err
@@ -337,7 +337,7 @@ func getTlsClient(requestInput RequestInput, sessionId string, withSession bool)
 			WriteBufferSize:        requestInput.TransportOptions.WriteBufferSize,
 			ReadBufferSize:         requestInput.TransportOptions.ReadBufferSize,
 			IdleConnTimeout:        requestInput.TransportOptions.IdleConnTimeout,
-			//RootCAs:                requestInput.TransportOptions.RootCAs,
+			// RootCAs:                requestInput.TransportOptions.RootCAs,
 		}
 
 		options = append(options, tls_client.WithTransportOptions(transportOptions))
@@ -370,10 +370,9 @@ func getTlsClient(requestInput RequestInput, sessionId string, withSession bool)
 			jarOptions = append(jarOptions, tls_client.WithDebugLogger())
 		}
 
-		jar := tls_client.NewCookieJar(jarOptions...)
-
-		if requestInput.WithDefaultCookieJar {
-			jar, _ := cookiejar.New(nil)
+		jar, _ := cookiejar.New(nil)
+		if requestInput.WithCustomCookieJar {
+			jar := tls_client.NewCookieJar(jarOptions...)
 			options = append(options, tls_client.WithCookieJar(jar))
 		} else {
 			options = append(options, tls_client.WithCookieJar(jar))
diff --git a/cffi_src/types.go b/cffi_src/types.go
@@ -82,7 +82,7 @@ type RequestInput struct {
 	DisableIPV6                 bool                `json:"disableIPV6"`
 	DisableIPV4                 bool                `json:"disableIPV4"`
 	WithDebug                   bool                `json:"withDebug"`
-	WithDefaultCookieJar        bool                `json:"withDefaultCookieJar"`
+	WithCustomCookieJar         bool                `json:"withCustomCookieJar"`
 	WithoutCookieJar            bool                `json:"withoutCookieJar"`
 	WithRandomTLSExtensionOrder bool                `json:"withRandomTLSExtensionOrder"`
 }
