OpenAPItor has configurable request timeouts

Makefile

@@ -28,6 +28,7 @@ kittycad: target/debug/openapitor
 		-d "A fully generated & opinionated API client for the KittyCAD API." \
 		--spec-url "https://api.kittycad.io" \
 		--base-url "https://api.kittycad.io" \
+		--request-timeout-seconds 600 \
 		--repo-name "KittyCAD/kittycad.rs" $(EXTRA_ARGS)
 	mv -f $(CURDIR)/kittycad/kittycad.rs.patch.json $(CURDIR)
 

kittycad/src/lib.rs

@@ -154,7 +154,7 @@ impl Client {
         let client_http1 = reqwest::Client::builder()
             // For file conversions we need this to be long.
             .user_agent(APP_USER_AGENT)
-            .timeout(std::time::Duration::from_secs(60))
+            .timeout(std::time::Duration::from_secs(600))
             .connect_timeout(std::time::Duration::from_secs(60))
             .http1_only()
             .build();

openapitor/src/client.rs

@@ -18,11 +18,19 @@ pub fn generate_client(opts: &crate::Opts) -> String {
                 "USER_CONSENT_ENDPOINT",
                 opts.user_consent_endpoint.as_ref().unwrap().as_ref(),
             )
+            .replace(
+                "TIMEOUT_NUM_SECONDS",
+                &opts.request_timeout_seconds.to_string(),
+            )
             .replace("BASE_URL", opts.base_url.to_string().trim_end_matches('/'));
     }
 
     if opts.basic_auth {
         return CLIENT_FUNCTIONS_BASIC_AUTH
+            .replace(
+                "TIMEOUT_NUM_SECONDS",
+                &opts.request_timeout_seconds.to_string(),
+            )
             .replace(
                 "ENV_VARIABLE_PREFIX",
                 &crate::template::get_env_variable_prefix(&opts.name),
@@ -31,6 +39,10 @@ pub fn generate_client(opts: &crate::Opts) -> String {
     }
 
     CLIENT_FUNCTIONS_TOKEN
+        .replace(
+            "TIMEOUT_NUM_SECONDS",
+            &opts.request_timeout_seconds.to_string(),
+        )
         .replace(
             "ENV_VARIABLE_PREFIX",
             &crate::template::get_env_variable_prefix(&opts.name),
@@ -74,8 +86,7 @@ impl Client {
             reqwest_retry::policies::ExponentialBackoff::builder().build_with_max_retries(3);
         let client = reqwest::Client::builder()
             .user_agent(APP_USER_AGENT)
-            // For file conversions we need this to be long.
-            .timeout(std::time::Duration::from_secs(600))
+            .timeout(std::time::Duration::from_secs(TIMEOUT_NUM_SECONDS))
             .connect_timeout(std::time::Duration::from_secs(60))
             .build();
         match client {
@@ -201,13 +212,13 @@ impl Client {
         let client = reqwest::Client::builder()
             .user_agent(APP_USER_AGENT)
             // For file conversions we need this to be long.
-            .timeout(std::time::Duration::from_secs(600))
+            .timeout(std::time::Duration::from_secs(TIMEOUT_NUM_SECONDS))
             .connect_timeout(std::time::Duration::from_secs(60))
             .build();
         let client_http1 = reqwest::Client::builder()
             // For file conversions we need this to be long.
             .user_agent(APP_USER_AGENT)
-            .timeout(std::time::Duration::from_secs(60))
+            .timeout(std::time::Duration::from_secs(TIMEOUT_NUM_SECONDS))
             .connect_timeout(std::time::Duration::from_secs(60))
             .http1_only()
             .build();

openapitor/src/lib.rs

@@ -458,6 +458,10 @@ pub struct Opts {
     /// Use basic auth for authentication instead of bearer tokens
     #[arg(long)]
     pub basic_auth: bool,
+
+    /// Default timeout on the client
+    #[arg(long)]
+    pub request_timeout_seconds: u64,
 }
 
 impl Opts {
@@ -523,6 +527,7 @@ impl Default for Opts {
             user_consent_endpoint: Default::default(),
             date_time_format: Default::default(),
             basic_auth: Default::default(),
+            request_timeout_seconds: 60,
         }
     }
 }