From ec79e075a9517d23b3540be35677809b8e2ed333 Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Tue, 3 May 2022 12:17:23 -0300 Subject: [PATCH] fix(core): http timeout field is optional, closes #4036 --- core/tauri/src/api/http.rs | 4 ++-- tooling/api/src/http.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/tauri/src/api/http.rs b/core/tauri/src/api/http.rs index 969a34b14..c62a6dfc2 100644 --- a/core/tauri/src/api/http.rs +++ b/core/tauri/src/api/http.rs @@ -48,7 +48,7 @@ pub struct ClientBuilder { /// Max number of redirections to follow. pub max_redirections: Option, /// Connect timeout for the request. - #[serde(deserialize_with = "deserialize_duration")] + #[serde(deserialize_with = "deserialize_duration", default)] pub connect_timeout: Option, } @@ -469,7 +469,7 @@ pub struct HttpRequestBuilder { /// The request body pub body: Option, /// Timeout for the whole request - #[serde(deserialize_with = "deserialize_duration")] + #[serde(deserialize_with = "deserialize_duration", default)] pub timeout: Option, /// The response type (defaults to Json) pub response_type: Option, diff --git a/tooling/api/src/http.ts b/tooling/api/src/http.ts index bbf12b3eb..707c0be26 100644 --- a/tooling/api/src/http.ts +++ b/tooling/api/src/http.ts @@ -51,8 +51,8 @@ interface Duration { } interface ClientOptions { - maxRedirections: number - connectTimeout: number | Duration + maxRedirections?: number + connectTimeout?: number | Duration } enum ResponseType {