move retry_after() to lib

Author: christianhoelzl

src/account.rs

@@ -14,15 +14,15 @@ use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "hyper-rustls")]
 use crate::DefaultClient;
-use crate::order::{Order, retry_after};
+use crate::order::Order;
 use crate::types::{
     AccountCredentials, AuthorizationStatus, Empty, Header, JoseJson, Jwk, KeyOrKeyId, NewAccount,
     NewAccountPayload, NewOrder, OrderState, Problem, ProfileMeta, RevocationRequest, Signer,
     SigningAlgorithm,
 };
 #[cfg(feature = "time")]
 use crate::types::{CertificateIdentifier, RenewalInfo};
-use crate::{BytesResponse, Client, Error, HttpClient, crypto, nonce_from_response};
+use crate::{BytesResponse, Client, Error, HttpClient, crypto, nonce_from_response, retry_after};
 
 /// An ACME account as described in RFC 8555 (section 7.1.2)
 ///

src/lib.rs

@@ -8,12 +8,15 @@ use std::error::Error as StdError;
 use std::fmt;
 use std::future::Future;
 use std::pin::Pin;
+use std::str::FromStr;
+use std::time::{Duration, SystemTime};
 
 use async_trait::async_trait;
 use bytes::Bytes;
-use http::header::CONTENT_TYPE;
+use http::header::{CONTENT_TYPE, RETRY_AFTER};
 use http::{Method, Request, Response, StatusCode};
 use http_body_util::{BodyExt, Full};
+use httpdate::HttpDate;
 #[cfg(feature = "hyper-rustls")]
 use hyper_util::client::legacy::Client as HyperClient;
 #[cfg(feature = "hyper-rustls")]
@@ -159,6 +162,28 @@ fn nonce_from_response(rsp: &BytesResponse) -> Option<String> {
         .and_then(|hv| String::from_utf8(hv.as_ref().to_vec()).ok())
 }
 
+/// Parse the `Retry-After` header from the response
+///
+/// <https://httpwg.org/specs/rfc9110.html#field.retry-after>
+///
+/// # Syntax
+///
+/// Retry-After = HTTP-date / delay-seconds
+/// delay-seconds  = 1*DIGIT
+fn retry_after(rsp: &BytesResponse) -> Option<SystemTime> {
+    let value = rsp.parts.headers.get(RETRY_AFTER)?.to_str().ok()?.trim();
+    if value.is_empty() {
+        return None;
+    }
+
+    Some(match u64::from_str(value) {
+        // `delay-seconds` is a number of seconds to wait
+        Ok(secs) => SystemTime::now() + Duration::from_secs(secs),
+        // `HTTP-date` looks like `Fri, 31 Dec 1999 23:59:59 GMT`
+        Err(_) => SystemTime::from(HttpDate::from_str(value).ok()?),
+    })
+}
+
 #[cfg(feature = "hyper-rustls")]
 struct DefaultClient(HyperClient<hyper_rustls::HttpsConnector<HttpConnector>, Full<Bytes>>);
 

src/order.rs

@@ -1,12 +1,9 @@
 use std::ops::{ControlFlow, Deref};
-use std::str::FromStr;
 use std::sync::Arc;
 use std::time::{Duration, Instant, SystemTime};
 use std::{fmt, slice};
 
 use base64::prelude::{BASE64_URL_SAFE_NO_PAD, Engine};
-use http::header::RETRY_AFTER;
-use httpdate::HttpDate;
 #[cfg(feature = "rcgen")]
 use rcgen::{CertificateParams, DistinguishedName, KeyPair};
 use serde::Serialize;
@@ -17,7 +14,7 @@ use crate::types::{
     Authorization, AuthorizationState, AuthorizationStatus, AuthorizedIdentifier, Challenge,
     ChallengeType, Empty, FinalizeRequest, OrderState, OrderStatus, Problem,
 };
-use crate::{BytesResponse, Error, Key, crypto, nonce_from_response};
+use crate::{Error, Key, crypto, nonce_from_response, retry_after};
 
 /// An ACME order as described in RFC 8555 (section 7.1.3)
 ///
@@ -613,25 +610,3 @@ impl RetryState {
         }
     }
 }
-
-/// Parse the `Retry-After` header from the response
-///
-/// <https://httpwg.org/specs/rfc9110.html#field.retry-after>
-///
-/// # Syntax
-///
-/// Retry-After = HTTP-date / delay-seconds
-/// delay-seconds  = 1*DIGIT
-pub(crate) fn retry_after(rsp: &BytesResponse) -> Option<SystemTime> {
-    let value = rsp.parts.headers.get(RETRY_AFTER)?.to_str().ok()?.trim();
-    if value.is_empty() {
-        return None;
-    }
-
-    Some(match u64::from_str(value) {
-        // `delay-seconds` is a number of seconds to wait
-        Ok(secs) => SystemTime::now() + Duration::from_secs(secs),
-        // `HTTP-date` looks like `Fri, 31 Dec 1999 23:59:59 GMT`
-        Err(_) => SystemTime::from(HttpDate::from_str(value).ok()?),
-    })
-}