backend/nsurlsession: fix double suspended task not being waken up, fix default timeout (#20)

* nsurlsession fix double suspended task not being waken up

* nsurlsession fix default timeout

Author: bdbai

backends/nsurlsession/src/async.rs

@@ -7,6 +7,7 @@ use nyquest_interface::client::ClientOptions;
 use nyquest_interface::r#async::{futures_io, AsyncBackend, AsyncClient, AsyncResponse};
 use nyquest_interface::{Error as NyquestError, Result as NyquestResult};
 use objc2::runtime::ProtocolObject;
+use objc2_foundation::NSURLSessionTaskState;
 use waker::AsyncWaker;
 
 pub(crate) mod waker;
@@ -81,7 +82,11 @@ impl futures_io::AsyncRead for NSUrlSessionAsyncResponse {
         let read_len = inner.shared.with_response_buffer_for_stream_mut(|data| {
             let read_len = if data.len() > buf.len() {
                 unsafe {
-                    inner.task.suspend();
+                    // Triggering a suspend when the task is already suspended can cause it to not
+                    // wake up.
+                    if inner.task.state() == NSURLSessionTaskState::Running {
+                        inner.task.suspend();
+                    }
                 }
                 buf.len()
             } else {

backends/nsurlsession/src/blocking.rs

@@ -2,6 +2,7 @@ use nyquest_interface::blocking::{BlockingBackend, BlockingClient, BlockingRespo
 use nyquest_interface::client::ClientOptions;
 use nyquest_interface::{Error as NyquestError, Result as NyquestResult};
 use objc2::runtime::ProtocolObject;
+use objc2_foundation::NSURLSessionTaskState;
 use waker::BlockingWaker;
 
 pub(crate) mod waker;
@@ -29,7 +30,11 @@ impl std::io::Read for NSUrlSessionBlockingResponse {
             let read_len = inner.shared.with_response_buffer_for_stream_mut(|data| {
                 let read_len = if data.len() > buf.len() {
                     unsafe {
-                        inner.task.suspend();
+                        // Triggering a suspend when the task is already suspended can cause it to
+                        // not wake up.
+                        if inner.task.state() == NSURLSessionTaskState::Running {
+                            inner.task.suspend();
+                        }
                     }
                     buf.len()
                 } else {

backends/nsurlsession/src/client.rs

@@ -8,7 +8,7 @@ use objc2::runtime::ProtocolObject;
 use objc2::AllocAnyThread;
 use objc2_foundation::{
     ns_string, NSCharacterSet, NSData, NSDictionary, NSMutableCharacterSet, NSMutableURLRequest,
-    NSString, NSURLRequestCachePolicy, NSUTF8StringEncoding, NSURL,
+    NSString, NSTimeInterval, NSURLRequestCachePolicy, NSUTF8StringEncoding, NSURL,
 };
 
 use crate::challenge::BypassServerVerifyDelegate;
@@ -34,9 +34,10 @@ impl NSUrlSessionClient {
             if !options.use_cookies {
                 config.setHTTPShouldSetCookies(false);
             }
-            if let Some(request_timeout) = options.request_timeout {
-                config.setTimeoutIntervalForRequest(request_timeout.as_secs_f64());
-            }
+            let timeout = options
+                .request_timeout
+                .map_or(NSTimeInterval::MAX, |t| t.as_secs_f64());
+            config.setTimeoutIntervalForRequest(timeout);
             if !options.default_headers.is_empty() || options.user_agent.is_some() {
                 let headers = options
                     .default_headers